Fix manifest lists (#4605)
* self hosted docker builds attempted fix * use imagetools instead of docker manifest
This commit is contained in:
parent
ab37f02ddc
commit
7f7ad799b3
16
.github/workflows/docker.yml
vendored
16
.github/workflows/docker.yml
vendored
@ -69,8 +69,6 @@ jobs:
|
|||||||
|
|
||||||
needs: [extract-version]
|
needs: [extract-version]
|
||||||
env:
|
env:
|
||||||
# We need to enable experimental docker features in order to use `docker buildx`
|
|
||||||
DOCKER_CLI_EXPERIMENTAL: enabled
|
|
||||||
VERSION: ${{ needs.extract-version.outputs.VERSION }}
|
VERSION: ${{ needs.extract-version.outputs.VERSION }}
|
||||||
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
|
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
|
||||||
FEATURE_SUFFIX: ${{ matrix.features.version_suffix }}
|
FEATURE_SUFFIX: ${{ matrix.features.version_suffix }}
|
||||||
@ -127,20 +125,22 @@ jobs:
|
|||||||
matrix:
|
matrix:
|
||||||
modernity: ["", "-modern"]
|
modernity: ["", "-modern"]
|
||||||
env:
|
env:
|
||||||
# We need to enable experimental docker features in order to use `docker manifest`
|
|
||||||
DOCKER_CLI_EXPERIMENTAL: enabled
|
|
||||||
VERSION: ${{ needs.extract-version.outputs.VERSION }}
|
VERSION: ${{ needs.extract-version.outputs.VERSION }}
|
||||||
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
|
VERSION_SUFFIX: ${{ needs.extract-version.outputs.VERSION_SUFFIX }}
|
||||||
steps:
|
steps:
|
||||||
|
- name: Set up Docker Buildx
|
||||||
|
uses: docker/setup-buildx-action@v2
|
||||||
|
|
||||||
- name: Dockerhub login
|
- name: Dockerhub login
|
||||||
run: |
|
run: |
|
||||||
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
|
echo "${DOCKER_PASSWORD}" | docker login --username ${DOCKER_USERNAME} --password-stdin
|
||||||
|
|
||||||
- name: Create and push multiarch manifest
|
- name: Create and push multiarch manifest
|
||||||
run: |
|
run: |
|
||||||
docker manifest create ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }} \
|
docker buildx imagetools create -t ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }} \
|
||||||
--amend ${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
|
${IMAGE_NAME}:${VERSION}-arm64${VERSION_SUFFIX}${{ matrix.modernity }} \
|
||||||
--amend ${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}${{ matrix.modernity }};
|
${IMAGE_NAME}:${VERSION}-amd64${VERSION_SUFFIX}${{ matrix.modernity }};
|
||||||
docker manifest push ${IMAGE_NAME}:${VERSION}${VERSION_SUFFIX}${{ matrix.modernity }}
|
|
||||||
build-docker-lcli:
|
build-docker-lcli:
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-22.04
|
||||||
needs: [extract-version]
|
needs: [extract-version]
|
||||||
|
Loading…
Reference in New Issue
Block a user