Skip to content

Commit

Permalink
Squashed 'release-tools/' changes from 29bd39b3..ad83def4
Browse files Browse the repository at this point in the history
kubernetes-csi/csi-release-tools@ad83def4 Merge kubernetes-csi/csi-release-tools#153 from pohly/fix-image-builds
kubernetes-csi/csi-release-tools@55617801 build.make: fix image publishng

git-subtree-dir: release-tools
git-subtree-split: ad83def420cb1027a0ab4b591aa5bdc05c1281a8
  • Loading branch information
pohly committed May 19, 2021
1 parent c7a9f27 commit ad7a8b6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion build.make
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ $(CMDS:%=push-multiarch-%): push-multiarch-%: check-pull-base-ref build-%
dockerfile_windows=$$(if [ -e ./cmd/$*/Dockerfile.Windows ]; then echo ./cmd/$*/Dockerfile.Windows; else echo Dockerfile.Windows; fi); \
if [ '$(BUILD_PLATFORMS)' ]; then build_platforms='$(BUILD_PLATFORMS)'; else build_platforms="linux amd64"; fi; \
if ! [ -f "$$dockerfile_windows" ]; then \
build_platforms="$$(echo "$$build_platforms" | sed -e 's/windows *[^ ]* *.exe *[^ ]* *[^ ]*//g' -e 's/; *;/;/g' -e 's/;[ ]*$//')"; \
build_platforms="$$(echo "$$build_platforms" | sed -e 's/windows *[^ ]* *.exe *[^ ]* *[^ ]*//g' -e 's/; *;/;/g' -e 's/;[ ]*$$//')"; \
fi; \
pushMultiArch () { \
tag=$$1; \
Expand Down

0 comments on commit ad7a8b6

Please sign in to comment.