svk/vault-unwrap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vault-wrap: Вроде починил сборку

Browse Source
This commit is contained in:
svkalinin 2024-07-10 16:52:02 +03:00
parent fc6232484d
commit 3da3dfed44
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.gitlab-ci.yml
View File

@ -79,11 +79,11 @@ traefik_deploy:
stage: deploy stage: deploy
script: script:
- mkdir -p /home/gitlab-runner/traefik - mkdir -p /home/gitlab-runner/traefik
- docker volume create traefik_traefik-ssl - docker volume create vault-wrap_traefik-ssl
- docker volume create traefik_traefik-dynamic-conf - docker volume create vault-wrap_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 vault-wrap_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 vault-wrap_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 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 - cp traefik-files/traefik.yml /home/gitlab-runner/traefik/traefik.yml
- export TLS_CERT_FILE=runner1-prod.corp.samsonopt.ru.crt - export TLS_CERT_FILE=runner1-prod.corp.samsonopt.ru.crt
- export TLS_KEY_FILE=runner1-prod.corp.samsonopt.ru.key - export TLS_KEY_FILE=runner1-prod.corp.samsonopt.ru.key

2
docker-compose.yml
View File

@ -4,6 +4,7 @@ services:
vault-wrap: vault-wrap:
# $IMAGE_PATH и $RELEASE_VERSION определены в .gitlab-ci.yml # $IMAGE_PATH и $RELEASE_VERSION определены в .gitlab-ci.yml
image: $IMAGE_PATH/vault-wrap:$RELEASE_VERSION image: $IMAGE_PATH/vault-wrap:$RELEASE_VERSION
container_name: vault-wrap
environment: environment:
- ACTION_ADDRESS=${ACTION_ADDRESS:-https://secret.corp.samsonopt.ru} - ACTION_ADDRESS=${ACTION_ADDRESS:-https://secret.corp.samsonopt.ru}
- VAULT_ADDRESS=${VAULT_ADDRESS} - VAULT_ADDRESS=${VAULT_ADDRESS}
@ -34,6 +35,7 @@ services:
traefik: traefik:
image: traefik:v3.0 image: traefik:v3.0
container_name: traefik
command: command:
# - --entrypoints.web.address=:80 # - --entrypoints.web.address=:80
# - --entrypoints.web-secure.address=:443 # - --entrypoints.web-secure.address=:443