mirror of
https://github.com/Portabase/portabase.git
synced 2026-07-14 11:16:13 +02:00
fix
This commit is contained in:
@@ -56,6 +56,7 @@ jobs:
|
|||||||
echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
|
echo "image=${{ inputs.image_name }}:${{inputs.version}}-$ARCH" >> $GITHUB_OUTPUT
|
||||||
echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
|
echo "safe_platform=${{ matrix.platform == 'linux/amd64' && 'linux-amd64' || 'linux-arm64' }}" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
|
|
||||||
- name: Build and push image
|
- name: Build and push image
|
||||||
uses: docker/build-push-action@v6
|
uses: docker/build-push-action@v6
|
||||||
with:
|
with:
|
||||||
@@ -98,28 +99,65 @@ jobs:
|
|||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_PASSWORD }}
|
password: ${{ secrets.DOCKER_PASSWORD }}
|
||||||
|
|
||||||
|
# - name: Extract Docker metadata
|
||||||
|
# id: meta
|
||||||
|
# uses: docker/metadata-action@v5
|
||||||
|
# with:
|
||||||
|
# images: ${{ inputs.image_name }}
|
||||||
|
# tags: |
|
||||||
|
# type=semver,pattern={{version}}
|
||||||
|
# type=semver,pattern={{major}}.{{minor}}
|
||||||
|
# type=semver,pattern={{major}}
|
||||||
|
# type=raw,value=latest,enable=${{ inputs.add_latest }}
|
||||||
|
#
|
||||||
|
# # - name: Create and push manifest list
|
||||||
|
# # working-directory: /tmp/digests
|
||||||
|
# # run: |
|
||||||
|
# # DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
|
||||||
|
# # TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
|
||||||
|
# # docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS
|
||||||
|
#
|
||||||
|
#
|
||||||
|
# - name: Create and push manifest list
|
||||||
|
# working-directory: /tmp/digests
|
||||||
|
# run: |
|
||||||
|
# DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
|
||||||
|
# TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
|
||||||
|
# echo $TAG_ARGS
|
||||||
|
# docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES
|
||||||
|
|
||||||
|
|
||||||
|
- name: Generate semantic tags
|
||||||
|
id: tags
|
||||||
|
run: |
|
||||||
|
VERSION="${{ inputs.version }}"
|
||||||
|
IFS='.' read -r MAJOR MINOR PATCH <<< "$VERSION"
|
||||||
|
|
||||||
|
TAGS="$VERSION"
|
||||||
|
if [ -n "$MINOR" ]; then
|
||||||
|
TAGS="$TAGS $MAJOR.$MINOR"
|
||||||
|
fi
|
||||||
|
if [ -n "$MAJOR" ]; then
|
||||||
|
TAGS="$TAGS $MAJOR"
|
||||||
|
fi
|
||||||
|
if [ "${{ inputs.add_latest }}" = "true" ]; then
|
||||||
|
TAGS="$TAGS latest"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "tags=$TAGS" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
- name: Extract Docker metadata
|
- name: Extract Docker metadata
|
||||||
id: meta
|
id: meta
|
||||||
uses: docker/metadata-action@v5
|
uses: docker/metadata-action@v5
|
||||||
with:
|
with:
|
||||||
images: ${{ inputs.image_name }}
|
images: ${{ inputs.image_name }}
|
||||||
tags: |
|
tags: |
|
||||||
type=semver,pattern={{version}}
|
type=raw,value=${{ steps.tags.outputs.tags }}
|
||||||
type=semver,pattern={{major}}.{{minor}}
|
|
||||||
type=semver,pattern={{major}}
|
|
||||||
type=raw,value=latest,enable=${{ inputs.add_latest }}
|
|
||||||
|
|
||||||
# - name: Create and push manifest list
|
|
||||||
# working-directory: /tmp/digests
|
|
||||||
# run: |
|
|
||||||
# DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
|
|
||||||
# TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
|
|
||||||
# docker buildx imagetools create $DOCKER_IMAGES $TAG_ARGS
|
|
||||||
|
|
||||||
|
|
||||||
- name: Create and push manifest list
|
- name: Create and push manifest list
|
||||||
working-directory: /tmp/digests
|
working-directory: /tmp/digests
|
||||||
run: |
|
run: |
|
||||||
DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
|
DOCKER_IMAGES="$(cat amd64/image.txt) $(cat arm64/image.txt)"
|
||||||
TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
|
TAG_ARGS=$(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON")
|
||||||
|
echo $TAG_ARGS
|
||||||
docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES
|
docker buildx imagetools create $TAG_ARGS $DOCKER_IMAGES
|
||||||
|
|||||||
@@ -92,7 +92,9 @@ jobs:
|
|||||||
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
|
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD_2 }}
|
||||||
|
|
||||||
finalize-release:
|
finalize-release:
|
||||||
needs: publish-docker
|
needs:
|
||||||
|
- create-release
|
||||||
|
- publish-docker
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
|
release_tag: ${{ steps.publish_release_step.outputs.release_tag }}
|
||||||
@@ -112,7 +114,10 @@ jobs:
|
|||||||
echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
|
echo "release_tag=$RELEASE_TAG" >> $GITHUB_OUTPUT
|
||||||
|
|
||||||
notify-discord:
|
notify-discord:
|
||||||
needs: finalize-release
|
needs:
|
||||||
|
- publish-docker
|
||||||
|
- create-release
|
||||||
|
- finalize-release
|
||||||
uses: ./.github/workflows/discord.yml
|
uses: ./.github/workflows/discord.yml
|
||||||
with:
|
with:
|
||||||
release_tag: ${{ needs.create-release.outputs.draft_tag }}
|
release_tag: ${{ needs.create-release.outputs.draft_tag }}
|
||||||
|
|||||||
Reference in New Issue
Block a user