Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "Makefile: Remove duplicated linuxkit argument" #16

Closed
wants to merge 2 commits into from
Closed

Revert "Makefile: Remove duplicated linuxkit argument" #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c309be3
Revert "Makefile: Remove duplicated linuxkit argument"
milan-zededa Jul 24, 2024
e0bb023
Remove login to dockerhub
milan-zededa Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 0 additions & 13 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading