Skip to content

Commit 45b22d6

Browse files
committed
Set repository path
1 parent caa6137 commit 45b22d6

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

.github/workflows/stage-3-build.yaml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,11 +87,10 @@ jobs:
8787
PR_NUMBER=$(gh pr list --state merged --search "$GITHUB_SHA" --json number -q '.[0].number' 2>/dev/null || true)
8888
fi
8989
90-
echo "Resolved PR number: $PR_NUMBER"
91-
echo "pr_num_tag=$PR_NUMBER" >> "$GITHUB_OUTPUT"
92-
9390
set -x
9491
[[ "${GITHUB_REF}" == "refs/heads/main" ]] && PR_NUMBER=$(gh api repos/{owner}/{repo}/commits/${GITHUB_SHA}/pulls --jq 'sort_by(.updated_at) | reverse | .[0].number')
92+
93+
echo "Resolved PR number: ${PR_NUMBER}"
9594
echo "pr_num_tag=pr${PR_NUMBER}" >> "${GITHUB_OUTPUT}"
9695
echo "short_commit_hash=$(git rev-parse --short ${GITHUB_SHA})" >> "${GITHUB_OUTPUT}"
9796
@@ -131,11 +130,16 @@ jobs:
131130
PR_NUM_TAG: ${{ needs.containers-to-build.outputs.pr_num_tag }}
132131
REGISTRY: ${{ env.USE_AZURECR == 'true' && format('{0}.azurecr.io', secrets.ACR_NAME) || format('ghcr.io/{0}', github.repository_owner) }}
133132
run: |
134-
echo "repository_path=${REGISTRY,,}/${IMAGE_NAME}" >> "${GITHUB_OUTPUT}"
133+
repository_path="${REGISTRY,,}/${IMAGE_NAME}"
134+
echo "repository_path=${repository_path}" >> "${GITHUB_OUTPUT}"
135+
echo repository_path=${repository_path}
135136
137+
echo Docker Compose...
136138
docker compose -f ${COMPOSE_FILE//,/ -f } -p ${PROJECT_NAME} build --no-cache --pull ${{ matrix.function }}
139+
140+
echo Docker Tag...
137141
docker tag ${IMAGE_NAME}:latest "${repository_path}:${PR_NUM_TAG}"
138-
[[ -n "${ENVIRONMENT_TAG}" ]] && docker tag "${IMAGE_NAME}:latest "${ENVIRONMENT_TAG}"
142+
[[ -n "${ENVIRONMENT_TAG}" ]] && docker tag "${IMAGE_NAME}:latest" "${repository_path}:${ENVIRONMENT_TAG}"
139143
140144
- name: AzureCLI login
141145
if: github.ref == 'refs/heads/main' && env.USE_AZURECR == 'true'
@@ -246,7 +250,7 @@ jobs:
246250
packages=$(gh api "/repos/{owner}/{repo}/packages?package_type=container&per_page=100" --jq '.[].name')
247251
for package in ${packages}; do
248252
echo "Adding tag ${package}:${SHORT_COMMIT_HASH}..."
249-
docker buildx imagetools create "${REGISTRY,,}/${package}:${PR_NUM_TAG}" --tag "${REGISTRY,,}/${package}:${SHORT_COMMIT_HASH}" || echo "Tagging failed for $package"
253+
docker buildx imagetools create "${REGISTRY,,}/${package,,}:${PR_NUM_TAG}" --tag "${REGISTRY,,}/${package,,}:${SHORT_COMMIT_HASH}" || echo "Tagging failed for $package"
250254
done
251255
252256
aggregate-reports:

0 commit comments

Comments
 (0)