From c309be36b7e082af927211b09d8bad91fff473d4 Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Wed, 24 Jul 2024 11:09:51 +0200 Subject: [PATCH 1/2] Revert "Makefile: Remove duplicated linuxkit argument" This reverts commit b9c076a633d6567492ac090aca6cb0d41f5d50f6. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e9cf6c6fc3..c388558af1 100644 --- a/Makefile +++ b/Makefile @@ -883,7 +883,7 @@ cache-export: image-set outfile-set $(LINUXKIT) ## export an image from linuxkit cache and load it into docker. cache-export-docker-load: $(LINUXKIT) $(eval TARFILE := $(shell mktemp)) - $(MAKE) cache-export OUTFILE=${TARFILE} && cat ${TARFILE} | docker load + $(MAKE) cache-export --format docker OUTFILE=${TARFILE} && cat ${TARFILE} | docker load rm -rf ${TARFILE} %-cache-export-docker-load: $(LINUXKIT) From e0bb0238263e939bb5af0478b2260473d075f9bb Mon Sep 17 00:00:00 2001 From: Milan Lenco Date: Wed, 24 Jul 2024 11:15:53 +0200 Subject: [PATCH 2/2] Remove login to dockerhub Signed-off-by: Milan Lenco --- .github/workflows/build.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94449531ef..841485ed80 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -45,12 +45,6 @@ jobs: repository: ${{ github.event.pull_request.head.repo.full_name }} ref: ${{ github.event.pull_request.head.ref }} fetch-depth: 0 - - name: Login to Docker Hub - if: ${{ github.event.repository.full_name }}== 'lf-edge/eve' - uses: docker/login-action@v3 - with: - username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} - password: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }} - name: ensure zstd for cache # this should be removed once the arm64 VM includes zstd if: ${{ matrix.os == 'buildjet-4vcpu-ubuntu-2204-arm' || matrix.os == 'arm64-secure' }} run: | @@ -112,13 +106,6 @@ jobs: ref: ${{ github.event.pull_request.head.ref }} fetch-depth: 0 - - name: Login to Docker Hub - if: ${{ github.event.repository.full_name }}== 'lf-edge/eve' - uses: docker/login-action@v3 - with: - username: ${{ secrets.RELEASE_DOCKERHUB_ACCOUNT }} - password: ${{ secrets.RELEASE_DOCKERHUB_TOKEN }} - # the next three steps - cache_for_docker, load images, and cache_for_packages - # having nothing to do with the content of the final eve image. Instead, it is because we are running # on amd64, and we need some of the tools in order to compose the final eve image for the target arch.