diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 212f91a95bc3bc3c353468837626c63924e55f87..2a6a0211666fd7a1fcf188c6b736e295705ea97d 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 698fbe6d62fd2f36e5bbc6f59410e7a43049b54e..d8eea9f933a02743e9dc99918164062b0910080e 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 558fe80947a7e78ee16d034c85cfc48298053276..54a8abc42c95b5148dd7021868ace6a273cad454 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 14a9b0f9e02bcbc39eb6b7a3832df38454d0dd29..33143dd876bdab003b79ea97d5ac73edf4831fc1 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 a5048bc0df9a3e3f34bc5077f29409de4a0df582..efebdc9ac3d050b69924f166f217443199d00121 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).