From e5aa948688df77b6333dbb27aa9faceac9772a4f Mon Sep 17 00:00:00 2001 From: buanet Date: Thu, 26 Jan 2023 22:38:20 +0100 Subject: [PATCH] change multiarch build --- .../build-debian-image-dev-node18.yml | 43 ++-------------- .github/workflows/build-debian-image-dev.yml | 51 +------------------ 2 files changed, 5 insertions(+), 89 deletions(-) diff --git a/.github/workflows/build-debian-image-dev-node18.yml b/.github/workflows/build-debian-image-dev-node18.yml index 239f2e8..e7656f6 100644 --- a/.github/workflows/build-debian-image-dev-node18.yml +++ b/.github/workflows/build-debian-image-dev-node18.yml @@ -12,7 +12,6 @@ jobs: uses: actions/checkout@v3 with: repository: 'buanet/ioBroker.docker' - ref: 'main' - name: Get and write version and date id: version @@ -33,11 +32,6 @@ jobs: sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node18/Dockerfile > ./debian/node18/Dockerfile.tmp mv -f ./debian/node18/Dockerfile.tmp ./debian/node18/Dockerfile - - name: Set up manifest tool - run: | - wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool - chmod +x manifest-tool - - name: Set up QEMU uses: docker/setup-qemu-action@v2.1.0 @@ -58,45 +52,16 @@ jobs: username: ${{ secrets.PACKAGES_USER }} password: ${{ secrets.PACKAGES_PASS }} - - name: Build Docker image (node18-amd64) + - name: Build Docker image (node18) uses: docker/build-push-action@v3.3.0 with: context: ./debian file: ./debian/node18/Dockerfile push: true - platforms: linux/amd64 + platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 tags: | - buanet/iobroker:dev-node18-amd64, - ghcr.io/buanet/iobroker:dev-node18-amd64 - - - name: Build Docker image (node18-arm32v7) - uses: docker/build-push-action@v3.3.0 - with: - context: ./debian - file: ./debian/node18/Dockerfile - push: true - platforms: linux/arm/v7 - tags: | - buanet/iobroker:dev-node18-arm32v7, - ghcr.io/buanet/iobroker:dev-node18-arm32v7 - - - name: Build Docker image (node18-arm64v8) - uses: docker/build-push-action@v3.3.0 - with: - context: ./debian - file: ./debian/node18/Dockerfile - push: true - platforms: linux/arm64/v8 - tags: | - buanet/iobroker:dev-node18-arm64v8, - ghcr.io/buanet/iobroker:dev-node18-arm64v8 - - - name: Create and push manifests - run: | - sed -e "s/\${VERSION}/dev-node18/g" -e "s/\${DOCKERTAG}/dev-node18/g" ./manifest.yml > manifest_dev-node18.yaml - ./manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev-node18.yaml - sed -e "s/\${VERSION}/dev-node18/g" -e "s/\${DOCKERTAG}/dev-node18/g" ./manifest_ghcr.yml > manifest_ghcr_dev-node18.yaml - ./manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev-node18.yaml + buanet/iobroker:dev-node18, + ghcr.io/buanet/iobroker:dev-node18 - name: Delete untagged images from GitHub packages uses: actions/github-script@v6 diff --git a/.github/workflows/build-debian-image-dev.yml b/.github/workflows/build-debian-image-dev.yml index d912f8e..9a1ced7 100644 --- a/.github/workflows/build-debian-image-dev.yml +++ b/.github/workflows/build-debian-image-dev.yml @@ -12,7 +12,6 @@ jobs: uses: actions/checkout@v3 with: repository: 'buanet/ioBroker.docker' - # ref: 'main' - name: Get and write version and date id: version @@ -33,14 +32,6 @@ jobs: sed -e "s/\${VERSION}/$VERSION-dev/" -e "s/\${DATI}/$DATI/" ./debian/node16/Dockerfile > ./debian/node16/Dockerfile.tmp mv -f ./debian/node16/Dockerfile.tmp ./debian/node16/Dockerfile -# - name: Set up manifest tool -# run: | -# git clone https://github.com/estesp/manifest-tool -# cd manifest-tool && make binary -# # wget https://github.com/estesp/manifest-tool/releases/download/v1.0.3/manifest-tool-linux-amd64 -O manifest-tool -# chmod +x manifest-tool -# cd .. - - name: Set up QEMU uses: docker/setup-qemu-action@v2.1.0 @@ -69,49 +60,9 @@ jobs: push: true platforms: linux/amd64,linux/arm/v7,linux/arm64/v8 tags: | - buanet/iobroker:dev + buanet/iobroker:dev, ghcr.io/buanet/iobroker:dev -# - name: Build Docker image (amd64) -# uses: docker/build-push-action@v3.3.0 -# with: -# context: ./debian -# file: ./debian/node16/Dockerfile -# push: true -# platforms: linux/amd64 -# tags: | -# buanet/iobroker:dev-amd64, -# ghcr.io/buanet/iobroker:dev-amd64 - -# - name: Build Docker image (arm32v7) -# uses: docker/build-push-action@v3.3.0 -# with: -# context: ./debian -# file: ./debian/node16/Dockerfile -# push: true -# platforms: linux/arm/v7 -# tags: | -# buanet/iobroker:dev-arm32v7, -# ghcr.io/buanet/iobroker:dev-arm32v7 - -# - name: Build Docker image (arm64v8) -# uses: docker/build-push-action@v3.3.0 -# with: -# context: ./debian -# file: ./debian/node16/Dockerfile -# push: true -# platforms: linux/arm64/v8 -# tags: | -# buanet/iobroker:dev-arm64v8, -# ghcr.io/buanet/iobroker:dev-arm64v8 - -# - name: Create and push manifests -# run: | -# sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest.yml > manifest_dev.yaml -# ./manifest-tool/manifest-tool --username ${{ secrets.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }} push from-spec manifest_dev.yaml -# sed -e "s/\${VERSION}/dev/g" -e "s/\${DOCKERTAG}/dev/g" ./manifest_ghcr.yml > manifest_ghcr_dev.yaml -# ./manifest-tool/manifest-tool --username ${{ secrets.PACKAGES_USER }} --password ${{ secrets.PACKAGES_PASS }} push from-spec manifest_ghcr_dev.yaml - - name: Delete untagged images from GitHub packages uses: actions/github-script@v6 with: