From 96bed76c24a97138354ef84f3068a7da1bc8722b Mon Sep 17 00:00:00 2001 From: Adar Nimrod <nimrod@shore.co.il> Date: Sat, 11 Feb 2023 19:03:32 +0200 Subject: [PATCH] Some cleanup. - Update the Terraform documentation. - Update Vouch. - Cleanup the GitLab CI file. --- .gitlab-ci.yml | 6 +++--- Compose/web-proxy/host01/docker-compose.yml | 2 +- Compose/web-proxy/kodi/docker-compose.yml | 2 +- Compose/web-proxy/ns4/docker-compose.yml | 2 +- Terraform/README.md | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 212f91a..2a6a021 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -85,14 +85,14 @@ web-proxy host01 build: tags: ["host01.shore.co.il"] variables: WORKDIR: Compose/web-proxy/host01 - # rules: *compose-rules + rules: *compose-rules web-proxy host01 pull: extends: .compose-pull tags: ["host01.shore.co.il"] variables: WORKDIR: Compose/web-proxy/host01 - # rules: *compose-rules + rules: *compose-rules web-proxy host01 run: extends: .compose-run @@ -100,4 +100,4 @@ web-proxy host01 run: variables: WORKDIR: Compose/web-proxy/host01 when: manual - # rules: *compose-rules + rules: *compose-rules diff --git a/Compose/web-proxy/host01/docker-compose.yml b/Compose/web-proxy/host01/docker-compose.yml index 698fbe6..d8eea9f 100644 --- a/Compose/web-proxy/host01/docker-compose.yml +++ b/Compose/web-proxy/host01/docker-compose.yml @@ -46,7 +46,7 @@ services: VOUCH_DOMAINS: shore.co.il VOUCH_JWT_MAXAGE: 10080 # 1 week. VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}" # pragma: allowlist secret - image: quay.io/vouch/vouch-proxy:alpine-0.36.0 + image: quay.io/vouch/vouch-proxy:alpine-0.39.0 restart: always networks: diff --git a/Compose/web-proxy/kodi/docker-compose.yml b/Compose/web-proxy/kodi/docker-compose.yml index 558fe80..54a8abc 100644 --- a/Compose/web-proxy/kodi/docker-compose.yml +++ b/Compose/web-proxy/kodi/docker-compose.yml @@ -38,7 +38,7 @@ services: VOUCH_DOMAINS: shore.co.il VOUCH_JWT_MAXAGE: 10080 # 1 week. VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}" # pragma: allowlist secret - image: quay.io/vouch/vouch-proxy:alpine-0.36.0 + image: quay.io/vouch/vouch-proxy:alpine-0.39.0 restart: always networks: diff --git a/Compose/web-proxy/ns4/docker-compose.yml b/Compose/web-proxy/ns4/docker-compose.yml index 14a9b0f..33143dd 100644 --- a/Compose/web-proxy/ns4/docker-compose.yml +++ b/Compose/web-proxy/ns4/docker-compose.yml @@ -43,7 +43,7 @@ services: VOUCH_DOMAINS: shore.co.il VOUCH_JWT_MAXAGE: 10080 # 1 week. VOUCH_JWT_SECRET: "${VOUCH_JWT_SECRET}" # pragma: allowlist secret - image: quay.io/vouch/vouch-proxy:alpine-0.36.0 + image: quay.io/vouch/vouch-proxy:alpine-0.39.0 restart: always networks: diff --git a/Terraform/README.md b/Terraform/README.md index a5048bc..efebdc9 100644 --- a/Terraform/README.md +++ b/Terraform/README.md @@ -2,7 +2,7 @@ Services managed with Terraform. -# Terraform state +## Terraform state Project usually store their state in GitLab using [GitLab managed Terraform State](https://docs.gitlab.com/ee/user/infrastructure/iac/terraform_state.html). -- GitLab