You've already forked Mailu
mirror of
https://github.com/Mailu/Mailu.git
synced 2025-07-17 01:32:29 +02:00
Merge #2517
2517: Use the new notation: arm64/v8 instead of arm64 r=mergify[bot] a=nextgens ## What type of PR? bug-fix ## What does this PR do? With a modern version of docker compose, on arm64 you get: ``` docker-compose pull [+] Running 0/8 ⠼ admin Pulling 1.4s ⠿ smtp Error 1.4s ⠿ imap Error 1.4s ⠿ webmail Error 1.4s ⠿ antispam Error 1.4s ⠼ redis Pulling 1.4s ⠼ front Pulling 1.4s ⠿ resolver Error 1.4s no matching manifest for linux/arm64/v8 in the manifest list entries ``` This may fix it. It's discussed at https://stackoverflow.com/questions/70819028/relation-between-linux-arm64-and-linux-arm64-v8-are-these-aliases-for-each-othe Co-authored-by: Florent Daigniere <nextgens@freenetproject.org> Co-authored-by: Dimitri Huisman <diman@huisman.xyz>
This commit is contained in:
2
.github/workflows/arm.yml
vendored
2
.github/workflows/arm.yml
vendored
@ -76,7 +76,7 @@ jobs:
|
|||||||
- derive-variables
|
- derive-variables
|
||||||
uses: ./.github/workflows/build_test_deploy.yml
|
uses: ./.github/workflows/build_test_deploy.yml
|
||||||
with:
|
with:
|
||||||
architecture: 'linux/arm64,linux/arm/v7'
|
architecture: 'linux/arm64/v8,linux/arm/v7'
|
||||||
mailu_version: ${{needs.derive-variables.outputs.MAILU_VERSION}}-arm
|
mailu_version: ${{needs.derive-variables.outputs.MAILU_VERSION}}-arm
|
||||||
pinned_mailu_version: ${{needs.derive-variables.outputs.PINNED_MAILU_VERSION}}-arm
|
pinned_mailu_version: ${{needs.derive-variables.outputs.PINNED_MAILU_VERSION}}-arm
|
||||||
docker_org: ${{needs.derive-variables.outputs.DOCKER_ORG}}
|
docker_org: ${{needs.derive-variables.outputs.DOCKER_ORG}}
|
||||||
|
2
.github/workflows/build_test_deploy.yml
vendored
2
.github/workflows/build_test_deploy.yml
vendored
@ -426,6 +426,7 @@ jobs:
|
|||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:${{ env.MAILU_VERSION }} \
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:${{ env.MAILU_VERSION }} \
|
||||||
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:$pinned_mailu_version \
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:$pinned_mailu_version \
|
||||||
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:latest \
|
||||||
ghcr.io/${{ steps.string.outputs.lowercase }}/${{ matrix.target }}:${{ env.MAILU_VERSION }}
|
ghcr.io/${{ steps.string.outputs.lowercase }}/${{ matrix.target }}:${{ env.MAILU_VERSION }}
|
||||||
|
|
||||||
deploy-arm:
|
deploy-arm:
|
||||||
@ -470,6 +471,7 @@ jobs:
|
|||||||
docker buildx imagetools create \
|
docker buildx imagetools create \
|
||||||
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:${{ env.MAILU_VERSION }} \
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:${{ env.MAILU_VERSION }} \
|
||||||
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:$pinned_mailu_version \
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:$pinned_mailu_version \
|
||||||
|
--tag ${{ inputs.docker_org }}/${{ matrix.target }}:latest \
|
||||||
ghcr.io/${{ steps.string.outputs.lowercase }}/${{ matrix.target }}:${{ env.MAILU_VERSION }}
|
ghcr.io/${{ steps.string.outputs.lowercase }}/${{ matrix.target }}:${{ env.MAILU_VERSION }}
|
||||||
|
|
||||||
#This job creates a tagged release. A tag is created for the pinned version x.y.z. The GH release refers to this tag.
|
#This job creates a tagged release. A tag is created for the pinned version x.y.z. The GH release refers to this tag.
|
||||||
|
Reference in New Issue
Block a user