Browse Source

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

Resolve "traefik.toml"

Closes #2

See merge request cyber5k/mistborn!8
merge-requests/8/merge
Steven Foerster 6 years ago
parent
commit
8624d06800
  1. 1
      .gitignore
  2. 17
      .gitlab-ci.yml
  3. 0
      compose/production/traefik/traefik.toml.template
  4. 1
      scripts/install.sh

1
.gitignore vendored

@ -0,0 +1 @@ @@ -0,0 +1 @@
compose/production/traefik/traefik.toml

17
.gitlab-ci.yml

@ -5,18 +5,19 @@ services: @@ -5,18 +5,19 @@ services:
variables:
GIT_SUBMODULE_STRATEGY: "recursive"
before_script:
- apk add docker-compose
- docker info
- docker-compose --version
MISTBORN_DEFAULT_PASSWORD: "default_password"
stages:
- test
include:
- template: Code-Quality.gitlab-ci.yml
test:
docker_build:
stage: test
script:
- scripts/subinstallers/gen_prod_env.sh "default_password"
- docker-compose -f base.yml build
- 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

0
compose/production/traefik/traefik.toml → compose/production/traefik/traefik.toml.template

1
scripts/install.sh

@ -180,6 +180,7 @@ sudo mkdir -p ../mistborn_volumes/base/pihole/etc-dnsmasqd @@ -180,6 +180,7 @@ sudo mkdir -p ../mistborn_volumes/base/pihole/etc-dnsmasqd
sudo mkdir -p ../mistborn_volumes/extra
# 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
# Download docker images while DNS is operable

Loading…
Cancel
Save