Merge branch '2-traefik-template' into 'master'

Resolve "traefik.toml"

Closes #2

See merge request cyber5k/mistborn!8
This commit is contained in:
Steven Foerster
2020-03-21 05:04:22 +00:00
4 changed files with 11 additions and 8 deletions
+1
View File
@@ -0,0 +1 @@
compose/production/traefik/traefik.toml
+7 -6
View File
@@ -5,18 +5,19 @@ services:
variables: variables:
GIT_SUBMODULE_STRATEGY: "recursive" GIT_SUBMODULE_STRATEGY: "recursive"
MISTBORN_DEFAULT_PASSWORD: "default_password"
before_script: stages:
- apk add docker-compose - test
- docker info
- docker-compose --version
include: include:
- template: Code-Quality.gitlab-ci.yml - template: Code-Quality.gitlab-ci.yml
test: docker_build:
stage: test stage: test
script: script:
- scripts/subinstallers/gen_prod_env.sh "default_password" - apk add docker-compose
- scripts/subinstallers/gen_prod_env.sh "$MISTBORN_DEFAULT_PASSWORD"
- cp compose/production/traefik/traefik.toml.template compose/production/traefik/traefik.toml
- docker-compose -f base.yml build - docker-compose -f base.yml build
+1
View File
@@ -180,6 +180,7 @@ sudo mkdir -p ../mistborn_volumes/base/pihole/etc-dnsmasqd
sudo mkdir -p ../mistborn_volumes/extra sudo mkdir -p ../mistborn_volumes/extra
# Traefik final setup (cockpit) # Traefik final setup (cockpit)
cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml
sudo sed -i "s/IPV4_PUBLIC/$IPV4_PUBLIC/" ./compose/production/traefik/traefik.toml sudo sed -i "s/IPV4_PUBLIC/$IPV4_PUBLIC/" ./compose/production/traefik/traefik.toml
# Download docker images while DNS is operable # Download docker images while DNS is operable