From 3da3dfed44bc7aaba9d1be624b015feeacdfed5c Mon Sep 17 00:00:00 2001
From: svkalinin <svkalinin@samsonpost.ru>
Date: Wed, 10 Jul 2024 16:52:02 +0300
Subject: [PATCH] =?UTF-8?q?vault-wrap:=20=D0=92=D1=80=D0=BE=D0=B4=D0=B5=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D1=87=D0=B8=D0=BD=D0=B8=D0=BB=20=D1=81=D0=B1=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BA=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitlab-ci.yml     | 10 +++++-----
 docker-compose.yml |  2 ++
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8d108e5..78615f4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -79,11 +79,11 @@ traefik_deploy:
   stage: deploy
   script:
     - 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/private/:/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
+    - docker volume create vault-wrap_traefik-ssl
+    - docker volume create  vault-wrap_traefik-dynamic-conf
+    - docker run --rm -v vault-wrap_traefik-ssl:/temporary -v /etc/ssl/certs/:/files alpine cp files/runner1-prod.corp.samsonopt.ru.crt /temporary
+    - docker run --rm -v vault-wrap_traefik-ssl:/temporary -v /etc/ssl/private/:/files alpine cp files/runner1-prod.corp.samsonopt.ru.key /temporary
+    - docker run --rm -v vault-wrap_traefik-dynamic-conf:/temporary -v ./traefik-files:/files alpine cp files/certificates.yml /temporary
     - 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
diff --git a/docker-compose.yml b/docker-compose.yml
index 42c7988..05337c7 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -4,6 +4,7 @@ services:
   vault-wrap:
     # $IMAGE_PATH и $RELEASE_VERSION определены в .gitlab-ci.yml
     image: $IMAGE_PATH/vault-wrap:$RELEASE_VERSION
+    container_name: vault-wrap
     environment:
       - ACTION_ADDRESS=${ACTION_ADDRESS:-https://secret.corp.samsonopt.ru}
       - VAULT_ADDRESS=${VAULT_ADDRESS}
@@ -34,6 +35,7 @@ services:
 
   traefik:
     image: traefik:v3.0
+    container_name: traefik
     command:
 #      - --entrypoints.web.address=:80
 #      - --entrypoints.web-secure.address=:443