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

Ensure consistent windows image names #1104

Merged
merged 1 commit into from
Apr 1, 2020
Merged

Ensure consistent windows image names #1104

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ windows_containers: build/windows/amd64/sonobuoy.exe
sed -e 's|BASEIMAGE|$(WIN_IMAGE)|g' \
-e 's|BINARY|build/windows/amd64/sonobuoy.exe|g' DockerfileWindows > DockerfileWindows-$$arch; \
$(MAKE) build_container DOCKERFILE=DockerfileWindows-$$arch; \
$(MAKE) build_container DOCKERFILE="DockerfileWindows-$$arch" TARGET="sonobuoy-windows-$$arch"; \
$(MAKE) build_container DOCKERFILE="DockerfileWindows-$$arch" TARGET="sonobuoy-win-$$arch"; \
else \
echo "Windows ARCH unknown"; \
fi \
Expand Down Expand Up @@ -208,15 +208,15 @@ push: pre
# Assumes you have the images built or loaded already. Not
# added as dependency due to having both Linux/Windows
# prereqs which can't be done on the same machine.
for arch in $(LINUX_ARCH); do \
$(MAKE) push_images TARGET="sonobuoy-$$arch"; \
done
ifeq ($(PUSH_WINDOWS),true)
for arch in $(WIN_ARCH); do \
$(MAKE) push_images TARGET="sonobuoy-win-$$arch"; \
done
else
echo '$$PUSH_WINDOWS not set, not pushing Windows images'
for arch in $(LINUX_ARCH); do \
$(MAKE) push_images TARGET="sonobuoy-$$arch"; \
done
endif

$(MAKE) push_manifest VERSION=$(IMAGE_BRANCH) TARGET="sonobuoy"
Expand Down