Docker/baseimage-docker
1
0
Fork 1
mirror of https://github.com/phusion/baseimage-docker.git synced 2026-03-26 04:18:46 +00:00
Code Issues Releases Wiki Activity

Ensure building multiarch works when the image name isn't overridden

Browse Source 
Stop tagging latest by when running the make release step
This commit is contained in:
Mark Ison
2019-05-30 15:04:35 +01:00
parent b5c34e9776
commit 9c9ffde394
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@@ -26,6 +26,9 @@ build:
./build.sh
docker build --no-cache -t $(NAME):$(VERSION_ARG) $(BUILD_ARG) --build-arg QEMU_ARCH=$(QEMU_ARCH) --platform $(PLATFORM) --rm image
build_multiarch:
env NAME=$(NAME) VERSION=$(VERSION_ARG) ./build-multiarch.sh
test:
env NAME=$(NAME) VERSION=$(VERSION_ARG) ./test/runner.sh
@@ -33,9 +36,9 @@ tag_latest:
docker tag $(NAME):$(VERSION_ARG) $(NAME):$(LATEST_VERSION)
tag_multiarch_latest:
env TAG_LATEST=true ./build-multiarch.sh
env NAME=$(NAME) VERSION=$(VERSION) TAG_LATEST=true ./build-multiarch.sh
release: test tag_latest
release: test
@if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION_ARG); then echo "$(NAME) version $(VERSION_ARG) is not yet built. Please run 'make build'"; false; fi
docker push $(NAME)
@echo "*** Don't forget to create a tag by creating an official GitHub release."