Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
V
VoxFrontend
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Disappointment industries™
VoxFrontend
Commits
1d69734c
Commit
1d69734c
authored
Nov 11, 2021
by
Tóth Miklós Tibor
Browse files
Options
Downloads
Patches
Plain Diff
Add tls memes
parent
bfde26d0
No related branches found
No related tags found
No related merge requests found
Pipeline
#9106
failed
Nov 11, 2021
Stage: test
Stage: build
Stage: docker
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
.gitlab-ci.yml
+0
-17
0 additions, 17 deletions
.gitlab-ci.yml
db/data.go
+10
-0
10 additions, 0 deletions
db/data.go
with
10 additions
and
17 deletions
.gitlab-ci.yml
+
0
−
17
View file @
1d69734c
...
@@ -36,20 +36,3 @@ build:
...
@@ -36,20 +36,3 @@ build:
-
mkdir -p /kaniko/.docker
-
mkdir -p /kaniko/.docker
-
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-
echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
-
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
-
/kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:latest
deploy
:
stage
:
deploy
image
:
kroniak/ssh-client
before_script
:
-
'
which
ssh-agent
||
(
apt-get
update
-y
&&
apt-get
install
openssh-client
-y
)'
-
eval $(ssh-agent -s)
-
echo "$SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add -
-
mkdir -p ~/.ssh
-
chmod 700 ~/.ssh
-
'
[[
-f
/.dockerenv
]]
&&
echo
-e
"Host
*\n\tStrictHostKeyChecking
no\n\n"
>
~/.ssh/config'
script
:
-
ssh mike@sch.mikesweb.site "mkdir -p ~/deploy/vox"
-
scp docker-compose.yml mike@sch.mikesweb.site:~/deploy/vox/
-
ssh root@sch.mikesweb.site "cd /home/mike/deploy/vox; docker pull registry.mikesweb.site/vox:latest; docker-compose up -d --remove-orphans"
only
:
-
master
\ No newline at end of file
This diff is collapsed.
Click to expand it.
db/data.go
+
10
−
0
View file @
1d69734c
package
db
package
db
import
(
import
(
"crypto/tls"
"fmt"
"fmt"
"git.sch.bme.hu/mikewashere/voxfrontend/languages"
"git.sch.bme.hu/mikewashere/voxfrontend/languages"
"github.com/go-pg/pg/v10"
"github.com/go-pg/pg/v10"
...
@@ -60,6 +61,15 @@ var db = pg.Connect(&pg.Options{
...
@@ -60,6 +61,15 @@ var db = pg.Connect(&pg.Options{
}
}
return
pw
return
pw
}(),
}(),
TLSConfig
:
func
()
*
tls
.
Config
{
if
os
.
Getenv
(
"NOTLS"
)
==
"true"
{
return
nil
}
else
{
return
&
tls
.
Config
{
InsecureSkipVerify
:
true
,
}
}
}(),
})
})
func
init
()
{
func
init
()
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment