From cc28237b9c0d1720ba3707d477e90fdb1638af3f Mon Sep 17 00:00:00 2001 From: svkalinin Date: Wed, 10 Jul 2024 15:52:30 +0300 Subject: [PATCH] =?UTF-8?q?vault-wrap:=20=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0=20=D1=81=D0=BA=D1=80=D0=B8=D0=BF=D1=82=D0=BE=D0=B2=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitlab-ci.yml | 4 ++-- docker-compose.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6e3ad0..803832c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -78,13 +78,13 @@ traefik_deploy: <<: *dedicated-runner stage: deploy script: - - mkdir -p /usr/local/etc/traefik + - mkdir -p /home/gitlab-runner/traefik - docker volume create traefik_traefik-ssl - docker volume create traefik_traefik-dynamic-conf - docker run --rm -v traefik_traefik-ssl:/temporary -v /etc/ssl/certs/:/files alpine cp files/runner1-prod.corp.samsonopt.ru.crt /temporary - docker run --rm -v traefik_traefik-ssl:/temporary -v /etc/ssl/certs/:/files alpine cp files/runner1-prod.corp.samsonopt.ru.key /temporary - docker run --rm -v traefik_traefik-dynamic-conf:/temporary -v ./traefik-files:/files alpine cp files/certificates.yml /temporary - - cp traefik-files/traefik.yml /usr/local/etc/traefik/traefik.yml + - cp traefik-files/traefik.yml /home/gitlab-runner/traefik/traefik.yml - export TLS_CERT_FILE=runner1-prod.corp.samsonopt.ru.crt - export TLS_KEY_FILE=runner1-prod.corp.samsonopt.ru.key - if [ -e .ci_status/vault_wrap_release ]; then docker-compose -f docker-compose.yml up -d traefik; fi diff --git a/docker-compose.yml b/docker-compose.yml index eb62a82..42c7988 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -42,7 +42,7 @@ services: - --providers.file.watch=true volumes: - traefik-dynamic-conf:/configuration/ - - /usr/local/etc/traefik/traefik.yml:/traefik.yml:ro + - /home/gitlab-runner/traefik/traefik.yml:/traefik.yml:ro - /var/run/docker.sock:/var/run/docker.sock:ro - traefik-ssl:/ssl/:ro ports: