Skip to content

Commit 6c1af74

Browse files
committed
Update fix bug
1 parent e487326 commit 6c1af74

File tree

3 files changed

+63
-25
lines changed

3 files changed

+63
-25
lines changed

.github/workflows/coding-service-publish.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,36 @@ jobs:
2929

3030
- name: Derive tags (Docker Hub + GHCR)
3131
id: meta
32+
shell: bash
3233
run: |
33-
OWNER_LC="${GITHUB_REPOSITORY_OWNER,,}"
34-
echo "OWNER_LC=$OWNER_LC" >> $GITHUB_ENV
34+
set -euo pipefail
35+
OWNER_LC="$(printf '%s' "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')"
36+
3537
if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
3638
TAG="${GITHUB_REF_NAME#v}"
3739
else
3840
TAG="${GITHUB_SHA::12}"
3941
fi
40-
echo "IMAGE_TAG=${TAG}" >> $GITHUB_ENV
42+
echo "IMAGE_TAG=${TAG}" >> "$GITHUB_ENV"
43+
44+
REPO_HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-${{ matrix.module || 'file-service' }}"
45+
REPO_GHCR="ghcr.io/${OWNER_LC}/codecampus-${{ matrix.module || 'file-service' }}"
46+
47+
HUB="${REPO_HUB}:${TAG}"
48+
GHCR="${REPO_GHCR}:${TAG}"
4149
42-
HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-coding-service:${TAG}"
43-
GHCR="ghcr.io/${OWNER_LC}/codecampus-coding-service:${TAG}"
4450
if [ "${GITHUB_REF_TYPE}" = "tag" ] || [ "${GITHUB_REF_NAME}" = "main" ]; then
45-
HUB="${HUB}"$'\n'"${{ secrets.DOCKERHUB_USER }}/codecampus-coding-service:latest"
46-
GHCR="${GHCR}"$'\n'"ghcr.io/${OWNER_LC}/codecampus-coding-service:latest"
51+
HUB="${HUB}"$'\n'"${REPO_HUB}:latest"
52+
GHCR="${GHCR}"$'\n'"${REPO_GHCR}:latest"
4753
fi
48-
echo "tags=${HUB}"$'\n'"${GHCR}" >> $GITHUB_OUTPUT
54+
55+
{
56+
echo "tags<<__TAGS__"
57+
printf '%s\n' "$HUB"
58+
printf '%s\n' "$GHCR"
59+
echo "__TAGS__"
60+
} >> "$GITHUB_OUTPUT"
61+
4962
5063
- name: Login to Docker Hub
5164
uses: docker/login-action@v3

.github/workflows/docker-publish.yml

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,36 @@ jobs:
4141

4242
- name: Derive tags (Docker Hub + GHCR)
4343
id: meta
44+
shell: bash
4445
run: |
45-
OWNER_LC="${GITHUB_REPOSITORY_OWNER,,}"
46-
echo "OWNER_LC=$OWNER_LC" >> $GITHUB_ENV
47-
MOD="${{ matrix.module }}"
46+
set -euo pipefail
47+
OWNER_LC="$(printf '%s' "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')"
48+
4849
if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
4950
TAG="${GITHUB_REF_NAME#v}"
5051
else
5152
TAG="${GITHUB_SHA::12}"
5253
fi
53-
echo "IMAGE_TAG=${TAG}" >> $GITHUB_ENV
54+
echo "IMAGE_TAG=${TAG}" >> "$GITHUB_ENV"
55+
56+
REPO_HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-${{ matrix.module || 'file-service' }}"
57+
REPO_GHCR="ghcr.io/${OWNER_LC}/codecampus-${{ matrix.module || 'file-service' }}"
58+
59+
HUB="${REPO_HUB}:${TAG}"
60+
GHCR="${REPO_GHCR}:${TAG}"
5461
55-
HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-${MOD}:${TAG}"
56-
GHCR="ghcr.io/${OWNER_LC}/codecampus-${MOD}:${TAG}"
5762
if [ "${GITHUB_REF_TYPE}" = "tag" ] || [ "${GITHUB_REF_NAME}" = "main" ]; then
58-
HUB="${HUB}"$'\n'"${{ secrets.DOCKERHUB_USER }}/codecampus-${MOD}:latest"
59-
GHCR="${GHCR}"$'\n'"ghcr.io/${OWNER_LC}/codecampus-${MOD}:latest"
63+
HUB="${HUB}"$'\n'"${REPO_HUB}:latest"
64+
GHCR="${GHCR}"$'\n'"${REPO_GHCR}:latest"
6065
fi
61-
echo "tags=${HUB}"$'\n'"${GHCR}" >> $GITHUB_OUTPUT
66+
67+
{
68+
echo "tags<<__TAGS__"
69+
printf '%s\n' "$HUB"
70+
printf '%s\n' "$GHCR"
71+
echo "__TAGS__"
72+
} >> "$GITHUB_OUTPUT"
73+
6274
6375
- name: Login to Docker Hub
6476
uses: docker/login-action@v3

.github/workflows/file-service-publish.yml

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,23 +29,36 @@ jobs:
2929

3030
- name: Derive tags (Docker Hub + GHCR)
3131
id: meta
32+
shell: bash
3233
run: |
33-
OWNER_LC="${GITHUB_REPOSITORY_OWNER,,}"
34-
echo "OWNER_LC=$OWNER_LC" >> $GITHUB_ENV
34+
set -euo pipefail
35+
OWNER_LC="$(printf '%s' "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]')"
36+
3537
if [ "${GITHUB_REF_TYPE}" = "tag" ]; then
3638
TAG="${GITHUB_REF_NAME#v}"
3739
else
3840
TAG="${GITHUB_SHA::12}"
3941
fi
40-
echo "IMAGE_TAG=${TAG}" >> $GITHUB_ENV
42+
echo "IMAGE_TAG=${TAG}" >> "$GITHUB_ENV"
43+
44+
REPO_HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-${{ matrix.module || 'file-service' }}"
45+
REPO_GHCR="ghcr.io/${OWNER_LC}/codecampus-${{ matrix.module || 'file-service' }}"
46+
47+
HUB="${REPO_HUB}:${TAG}"
48+
GHCR="${REPO_GHCR}:${TAG}"
4149
42-
HUB="${{ secrets.DOCKERHUB_USER }}/codecampus-file-service:${TAG}"
43-
GHCR="ghcr.io/${OWNER_LC}/codecampus-file-service:${TAG}"
4450
if [ "${GITHUB_REF_TYPE}" = "tag" ] || [ "${GITHUB_REF_NAME}" = "main" ]; then
45-
HUB="${HUB}"$'\n'"${{ secrets.DOCKERHUB_USER }}/codecampus-file-service:latest"
46-
GHCR="${GHCR}"$'\n'"ghcr.io/${OWNER_LC}/codecampus-file-service:latest"
51+
HUB="${HUB}"$'\n'"${REPO_HUB}:latest"
52+
GHCR="${GHCR}"$'\n'"${REPO_GHCR}:latest"
4753
fi
48-
echo "tags=${HUB}"$'\n'"${GHCR}" >> $GITHUB_OUTPUT
54+
55+
{
56+
echo "tags<<__TAGS__"
57+
printf '%s\n' "$HUB"
58+
printf '%s\n' "$GHCR"
59+
echo "__TAGS__"
60+
} >> "$GITHUB_OUTPUT"
61+
4962
5063
- name: Login to Docker Hub
5164
uses: docker/login-action@v3

0 commit comments

Comments
 (0)