diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e737230 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +compose/production/traefik/traefik.toml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9b40318..f56b619 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/compose/production/traefik/traefik.toml b/compose/production/traefik/traefik.toml.template similarity index 100% rename from compose/production/traefik/traefik.toml rename to compose/production/traefik/traefik.toml.template diff --git a/scripts/install.sh b/scripts/install.sh index 26c68f8..9685623 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -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