add fix for latest-tag in workflow
All checks were successful
/ release-and-build (push) Successful in 1m32s
All checks were successful
/ release-and-build (push) Successful in 1m32s
This commit is contained in:
@@ -1,11 +1,11 @@
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- 'main'
|
- "main"
|
||||||
tags:
|
tags:
|
||||||
- '*'
|
- "*"
|
||||||
schedule:
|
schedule:
|
||||||
- cron: '0 5 * * 0'
|
- cron: "0 5 * * 0"
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
@@ -29,6 +29,10 @@ jobs:
|
|||||||
|
|
||||||
echo "push_targets=$PUSH" >> $GITHUB_OUTPUT
|
echo "push_targets=$PUSH" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
LATEST_FLAG="${BUILD_TAG_LATEST:-n}"
|
||||||
|
LATEST_FLAG_LOWER=$(echo "$LATEST_FLAG" | tr '[:upper:]' '[:lower:]')
|
||||||
|
echo "tag_latest=$LATEST_FLAG_LOWER" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
ARGS_HASH=$(grep "^BUILD_" buildargs.env | sha256sum | cut -d' ' -f1)
|
ARGS_HASH=$(grep "^BUILD_" buildargs.env | sha256sum | cut -d' ' -f1)
|
||||||
echo "build_args_hash=$ARGS_HASH" >> $GITHUB_OUTPUT
|
echo "build_args_hash=$ARGS_HASH" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
@@ -117,6 +121,9 @@ jobs:
|
|||||||
BASE=${{ steps.prep.outputs.base_image }}
|
BASE=${{ steps.prep.outputs.base_image }}
|
||||||
REPO_PURE=${{ steps.prep.outputs.repo_pure }}
|
REPO_PURE=${{ steps.prep.outputs.repo_pure }}
|
||||||
|
|
||||||
|
# NEU: Wir laden unser Flag rein
|
||||||
|
TAG_LATEST="${{ steps.prep.outputs.tag_latest }}"
|
||||||
|
|
||||||
set -a
|
set -a
|
||||||
source <(grep -v '^#' buildargs.env | sed 's/\r$//')
|
source <(grep -v '^#' buildargs.env | sed 's/\r$//')
|
||||||
set +a
|
set +a
|
||||||
@@ -146,15 +153,33 @@ jobs:
|
|||||||
--pull --platform linux/arm64 -f Dockerfile.aarch64 \
|
--pull --platform linux/arm64 -f Dockerfile.aarch64 \
|
||||||
--label "pi_farm.base_digest=$BASE_SHA" --label "pi_farm.args_hash=$ARGS_HASH" --push .
|
--label "pi_farm.base_digest=$BASE_SHA" --label "pi_farm.args_hash=$ARGS_HASH" --push .
|
||||||
|
|
||||||
|
# --- NEU: Dynamische Tags für Gitea ---
|
||||||
|
GITEA_TAGS=("-t" "$IMAGE_GITEA:$TAG")
|
||||||
|
if [ "$TAG_LATEST" == "y" ]; then
|
||||||
|
GITEA_TAGS+=("-t" "$IMAGE_GITEA:latest")
|
||||||
|
echo "🏷️ Gitea: 'latest' tag will be set."
|
||||||
|
else
|
||||||
|
echo "ℹ️ Gitea: 'latest' tag will not be set."
|
||||||
|
fi
|
||||||
|
|
||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
||||||
-t $IMAGE_GITEA:$TAG -t $IMAGE_GITEA:latest $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
|
"${GITEA_TAGS[@]}" $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
|
||||||
|
|
||||||
if [[ "$PUSH" == *"dockerhub"* ]]; then
|
if [[ "$PUSH" == *"dockerhub"* ]]; then
|
||||||
DOCKERHUB_REPO="${{ secrets.DOCKERHUB_USERNAME }}/$REPO_PURE"
|
DOCKERHUB_REPO="${{ secrets.DOCKERHUB_USERNAME }}/$REPO_PURE"
|
||||||
|
|
||||||
|
DH_TAGS=("-t" "$DOCKERHUB_REPO:$TAG")
|
||||||
|
if [ "$TAG_LATEST" == "y" ]; then
|
||||||
|
DH_TAGS+=("-t" "$DOCKERHUB_REPO:latest")
|
||||||
|
echo "🏷️ Docker Hub: 'latest' tag will be set."
|
||||||
|
else
|
||||||
|
echo "ℹ️ Docker Hub: 'latest' tag will not be set."
|
||||||
|
fi
|
||||||
|
|
||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
--annotation "index:pi_farm.base_digest=$BASE_SHA" --annotation "index:pi_farm.args_hash=$ARGS_HASH" \
|
||||||
-t $DOCKERHUB_REPO:$TAG -t $DOCKERHUB_REPO:latest $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
|
"${DH_TAGS[@]}" $IMAGE_GITEA:tmp-amd64 $IMAGE_GITEA:tmp-arm64
|
||||||
fi
|
fi
|
||||||
|
|
||||||
- name: Update Documentation and Compose
|
- name: Update Documentation and Compose
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
BUILD_TAG=3.23
|
BUILD_TAG=3.22
|
||||||
|
BUILD_TAG_LATEST=n
|
||||||
BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
|
BUILD_BASE_IMAGE=alpine:${BUILD_TAG}
|
||||||
# Examples for BASE_IMAGE
|
# Examples for BASE_IMAGE
|
||||||
# alpine:${BUILD_TAG}
|
# alpine:${BUILD_TAG}
|
||||||
|
|||||||
Reference in New Issue
Block a user