Skip to content

Commit 7656314

Browse files
committed
chore: update name of variable in ci configs [ci skip]
1 parent 7979938 commit 7656314

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

.github/workflows/kubernetes.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ jobs:
3535
run: |
3636
git fetch
3737
echo "root_version="$(npm pkg get version --workspaces=false | tr -d \") >> "$GITHUB_OUTPUT"
38-
- name: Set SINGLE_SIGN_ON_version
39-
id: SINGLE_SIGN_ON_version
38+
- name: Set server_version
39+
id: server_version
4040
run: |
4141
git fetch
42-
echo "SINGLE_SIGN_ON_version="$(cd ./apps/server && npm pkg get version --workspaces=false | tr -d \") >> "$GITHUB_OUTPUT"
42+
echo "server_version="$(cd ./apps/server && npm pkg get version --workspaces=false | tr -d \") >> "$GITHUB_OUTPUT"
4343
- name: Set client_version
4444
id: client_version
4545
run: |
4646
git fetch
4747
echo "client_version="$(cd ./apps/client && npm pkg get version --workspaces=false | tr -d \") >> "$GITHUB_OUTPUT"
4848
outputs:
4949
root_version: ${{ steps.root_version.outputs.root_version }}
50-
SINGLE_SIGN_ON_version: ${{ steps.SINGLE_SIGN_ON_version.outputs.SINGLE_SIGN_ON_version }}
50+
server_version: ${{ steps.server_version.outputs.server_version }}
5151
client_version: ${{ steps.client_version.outputs.client_version }}
5252

5353
check-server-image:
@@ -61,7 +61,7 @@ jobs:
6161
id: check-exists
6262
run: |
6363
export TOKEN=$(curl -u ${{ github.actor }}:${{ secrets.NESTJS_MOD_ACCESS_TOKEN_DOCKER }} https://${{ env.REGISTRY }}/token\?scope\="repository:${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:pull" | jq -r .token)
64-
curl --head --fail -H "Authorization: Bearer $TOKEN" https://${{ env.REGISTRY }}/v2/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}/manifests/${{ needs.release.outputs.SINGLE_SIGN_ON_version }}
64+
curl --head --fail -H "Authorization: Bearer $TOKEN" https://${{ env.REGISTRY }}/v2/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}/manifests/${{ needs.release.outputs.server_version }}
6565
- name: Store result of check exists docker image
6666
id: store-check-exists
6767
if: ${{ !contains(needs.check-exists.outputs.result, 'HTTP/2 404') }}
@@ -98,8 +98,8 @@ jobs:
9898
push: true
9999
file: ./.docker/server.Dockerfile
100100
build-args: BASE_SINGLE_SIGN_ON_IMAGE_TAG=${{ needs.release.outputs.root_version }}
101-
tags: ${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:${{ needs.release.outputs.SINGLE_SIGN_ON_version }},${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:latest
102-
cache-from: type=registry,ref=${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:${{ needs.release.outputs.SINGLE_SIGN_ON_version }}
101+
tags: ${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:${{ needs.release.outputs.server_version }},${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:latest
102+
cache-from: type=registry,ref=${{ env.REGISTRY}}/${{ env.SINGLE_SIGN_ON_IMAGE_NAME}}:${{ needs.release.outputs.server_version }}
103103
cache-to: type=inline
104104
- name: Generate artifact attestation
105105
continue-on-error: true
@@ -116,7 +116,7 @@ jobs:
116116
runs-on: [self-hosted]
117117
env:
118118
ROOT_VERSION: ${{ needs.release.outputs.root_version }}
119-
SINGLE_SIGN_ON_VERSION: ${{ needs.release.outputs.SINGLE_SIGN_ON_version }}
119+
SERVER_VERSION: ${{ needs.release.outputs.server_version }}
120120
CLIENT_VERSION: ${{ needs.release.outputs.client_version }}
121121

122122
steps:
@@ -207,7 +207,7 @@ jobs:
207207
id-token: write
208208
env:
209209
ROOT_VERSION: ${{ needs.release.outputs.root_version }}
210-
SINGLE_SIGN_ON_VERSION: ${{ needs.release.outputs.SINGLE_SIGN_ON_version }}
210+
SERVER_VERSION: ${{ needs.release.outputs.server_version }}
211211
CLIENT_VERSION: ${{ needs.release.outputs.client_version }}
212212
steps:
213213
- name: Checkout repository

.kubernetes/set-env.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export NX_SKIP_NX_CACHE=true
1818
if [ -z "${ROOT_VERSION}" ]; then
1919
export ROOT_VERSION=$(npm pkg get version --workspaces=false | tr -d \")
2020
fi
21-
if [ -z "${SINGLE_SIGN_ON_VERSION}" ]; then
22-
export SINGLE_SIGN_ON_VERSION=$(cd ./apps/server && npm pkg get version --workspaces=false | tr -d \")
21+
if [ -z "${SERVER_VERSION}" ]; then
22+
export SERVER_VERSION=$(cd ./apps/server && npm pkg get version --workspaces=false | tr -d \")
2323
fi
2424

2525
if [ -z "${CLIENT_VERSION}" ]; then

.kubernetes/templates/server/3.deployment.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ spec:
1717
spec:
1818
containers:
1919
- name: %NAMESPACE%-server
20-
image: ghcr.io/nestjs-mod/nestjs-mod-sso-server:%SINGLE_SIGN_ON_VERSION%
20+
image: ghcr.io/nestjs-mod/nestjs-mod-sso-server:%SERVER_VERSION%
2121
imagePullPolicy: IfNotPresent
2222
ports:
2323
- containerPort: %SINGLE_SIGN_ON_PORT%

0 commit comments

Comments
 (0)