From ef9e11993a4935843124fe02e24f6bd8f5a93df9 Mon Sep 17 00:00:00 2001 From: svkalinin Date: Wed, 10 Jul 2024 15:26:15 +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 | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb9f851..2a6d2cf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -63,8 +63,10 @@ vault_wrap_deploy: stage: deploy script: - docker volume create vault-wrap_vault-wrap-conf - - cp /etc/ssl/certs/runner1-prod.corp.samsonopt.ru.crt /srv/docker/volumes/vault-wrap_vault-wrap-conf/_data/ - - cp /etc/ssl/private/runner1-prod.corp.samsonopt.ru.key /srv/docker/volumes/vault-wrap_vault-wrap-conf/_data/ + - docker run --rm -it -v vault-wrap_vault-wrap-conf:/temporary -v /etc/ssl/certs/:/files alpine cp files/runner1-prod.corp.samsonopt.ru.crt /temporary + - docker run --rm -it -v vault-wrap_vault-wrap-conf:/temporary -v /etc/ssl/private/:/files alpine cp big-data/runner1-prod.corp.samsonopt.ru.key /temporary + # -cp /etc/ssl/certs/runner1-prod.corp.samsonopt.ru.crt /srv/docker/volumes/vault-wrap_vault-wrap-conf/_data/ + # - cp /etc/ssl/private/runner1-prod.corp.samsonopt.ru.key /srv/docker/volumes/vault-wrap_vault-wrap-conf/_data/ - 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 vault-wrap; fi @@ -72,21 +74,21 @@ vault_wrap_deploy: refs: - main -traefik_deploy: - <<: *dedicated-runner - stage: deploy - script: - - mkdir -p /usr/local/etc/traefik - - docker volume create traefik_traefik-ssl - - docker volume create traefik_traefik-dynamic-conf - - cp /etc/ssl/certs/runner1-prod.corp.samsonopt.ru.crt /srv/docker/volumes/traefik-traefik-ssl/_data - - cp /etc/ssl/private/runner1-prod.corp.samsonopt.ru.key /srv/docker/volumes/traefik_traefik-ssl/_data - - cp traefik-files/traefik.yml /usr/local/etc/traefik/traefik.yml - - cp traefik-files/certificates.yml /srv/docker/volumes/traefik_traefik-dynamic-conf/_data/certificates.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 - only: - refs: - - main - +# traefik_deploy: + # <<: *dedicated-runner + # stage: deploy + # script: + # - mkdir -p /usr/local/etc/traefik + # - docker volume create traefik_traefik-ssl + # - docker volume create traefik_traefik-dynamic-conf + # - cp /etc/ssl/certs/runner1-prod.corp.samsonopt.ru.crt /srv/docker/volumes/traefik_traefik-ssl/_data + # - cp /etc/ssl/private/runner1-prod.corp.samsonopt.ru.key /srv/docker/volumes/traefik_traefik-ssl/_data + # - cp traefik-files/traefik.yml /usr/local/etc/traefik/traefik.yml + # - cp traefik-files/certificates.yml /srv/docker/volumes/traefik_traefik-dynamic-conf/_data/certificates.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 + # only: + # refs: + # - main +#