diff options
| author | Adin Scannell <ascannell@google.com> | 2020-12-09 18:48:52 -0800 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-12-09 18:51:17 -0800 |
| commit | 65a2242db409e7f4aeef04a01eb4f89699557866 (patch) | |
| tree | cfb631cdab80793dadb00d19e4039a0d8826deb0 /tools/images.mk | |
| parent | 92ca72ecb73d91e9def31e7f9835adf7a50b3d65 (diff) | |
Tweak aarch64 support.
A few images were broken with respect to aarch64. We should now
be able to run push-all-images with ARCH=aarch64 as part of the
regular continuous integration builds, and add aarch64 smoke tests
(via user emulation for now) to the regular test suite (future).
PiperOrigin-RevId: 346685462
Diffstat (limited to 'tools/images.mk')
| -rw-r--r-- | tools/images.mk | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/tools/images.mk b/tools/images.mk index ef72f2b80..46f56bb2c 100644 --- a/tools/images.mk +++ b/tools/images.mk @@ -99,8 +99,8 @@ loaded1_$(1)=.PHONY: load-$$(1) endef $(foreach image, $(EXISTING_IMAGES), $(eval $(call existing_image_rule,$(image)))) define tag_expand_rule = -$(eval $(loaded0_$(call local_image,$(1))_$(call tag,$(1)))) -$(eval $(loaded1_$(call local_image,$(1))_$(call tag,$(1)))) +$(eval $(loaded0_$(call remote_image,$(1))_$(call tag,$(1)))) +$(eval $(loaded1_$(call remote_image,$(1))_$(call tag,$(1)))) endef $(foreach image, $(ALL_IMAGES), $(eval $(call tag_expand_rule,$(image)))) @@ -108,16 +108,19 @@ $(foreach image, $(ALL_IMAGES), $(eval $(call tag_expand_rule,$(image)))) # ensure that caching works as expected, as well as the "latest" tag that is # used by the tests. local_tag = \ - docker tag $(call remote_image,$(1)):$(call tag,$(1)) $(call local_image,$(1)):$(call tag,$(1)) && \ - docker tag $(call remote_image,$(1)):$(call tag,$(1)) $(call local_image,$(1)) + docker tag $(call remote_image,$(1)):$(call tag,$(1)) $(call local_image,$(1)):$(call tag,$(1)) +latest_tag = \ + docker tag $(call local_image,$(1)):$(call tag,$(1)) $(call local_image,$(1)) tag-%: ## Tag a local image. - @$(call local_tag,$*) + @$(call header,TAG $*) + @$(call local_tag,$*) && $(call latest_tag,$*) # pull forces the image to be pulled. pull = \ $(call header,PULL $(1)) && \ docker pull $(DOCKER_PLATFORM_ARGS) $(call remote_image,$(1)):$(call tag,$(1)) && \ - $(call local_tag,$(1)) + $(call local_tag,$(1)) && \ + $(call latest_tag,$(1)) pull-%: register-cross ## Force a repull of the image. @$(call pull,$*) @@ -134,7 +137,8 @@ rebuild = \ -t "$(call remote_image,$(1)):$(call tag,$(1))" \ $$T && \ rm -rf $$T) && \ - $(call local_tag,$(1)) + $(call local_tag,$(1)) && \ + $(call latest_tag,$(1)) rebuild-%: register-cross ## Force rebuild an image locally. @$(call rebuild,$*) |