diff --git a/.github/actions/build-eve/action.yml b/.github/actions/build-eve/action.yml index fddbb68a5ef..20e8f40e292 100644 --- a/.github/actions/build-eve/action.yml +++ b/.github/actions/build-eve/action.yml @@ -58,7 +58,7 @@ runs: shell: bash run: | make cache-export ZARCH=${{ inputs.arch }} \ - IMAGE=lfedge/eve:$VERSION-${{ inputs.hv }} \ + IMAGE=${LINUXKIT_PKG_ORG:-lfedge}/eve:$VERSION-${{ inputs.hv }} \ OUTFILE=eve-${{ inputs.hv }}-${{ inputs.arch }}-${{ inputs.platform }}.tar \ IMAGE_NAME=$TAG-${{ inputs.hv }}-${{ inputs.arch }} - name: Upload EVE image diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c573574f14f..ad23099ed06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -445,7 +445,7 @@ jobs: docker system df -v - name: Export docker container run: | - make cache-export ZARCH=riscv64 IMAGE=lfedge/eve:$VERSION-mini \ + make cache-export ZARCH=riscv64 IMAGE=${LINUXKIT_PKG_ORG:-lfedge}/eve:$VERSION-mini \ OUTFILE=eve-mini-riscv64-generic.tar IMAGE_NAME=$TAG-mini-riscv64 - name: Upload EVE mini-riscv64-generic uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0 diff --git a/pkg/mkconf/Dockerfile b/pkg/mkconf/Dockerfile index 8af8b985d97..b7d71ecfc6f 100644 --- a/pkg/mkconf/Dockerfile +++ b/pkg/mkconf/Dockerfile @@ -1,4 +1,5 @@ FROM lfedge/eve-alpine:ef20bcb617db5545765f4d7486621cf606e5595e AS build +# [DO NOT MERGE] force a rebuild of this package to exercise the Zot push path ENV PKGS mtools dosfstools RUN eve-alpine-deploy.sh