From 364e17c5d529bc146658826f7b81027f5352a72c Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 12 Mar 2021 00:07:07 +0100 Subject: [PATCH 1/2] Tag base image like the others --- Makefile | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Makefile b/Makefile index bc5282d..83f96e4 100644 --- a/Makefile +++ b/Makefile @@ -278,7 +278,16 @@ manylinux1-x86.test: manylinux1-x86 base: Dockerfile imagefiles/ $(DOCKER) build -t $(ORG)/base:latest \ --build-arg IMAGE=$(ORG)/base \ + --build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_URL=`git config --get remote.origin.url` \ + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ + . + $(DOCKER) build -t $(ORG)/base:$(TAG) \ + --build-arg IMAGE=$(ORG)/base \ + --build-arg VERSION=$(TAG) \ + --build-arg VCS_REF=`git rev-parse --short HEAD` \ + --build-arg VCS_URL=`git config --get remote.origin.url` \ + --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ . base.test: base From 8115b1dda36f18d76b00c314d97f4b39f431ad01 Mon Sep 17 00:00:00 2001 From: Jonas Vautherin Date: Fri, 12 Mar 2021 01:06:33 +0100 Subject: [PATCH 2/2] Apply suggestions from code review --- Makefile | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Makefile b/Makefile index 83f96e4..d9caa7d 100644 --- a/Makefile +++ b/Makefile @@ -278,16 +278,12 @@ manylinux1-x86.test: manylinux1-x86 base: Dockerfile imagefiles/ $(DOCKER) build -t $(ORG)/base:latest \ --build-arg IMAGE=$(ORG)/base \ - --build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_URL=`git config --get remote.origin.url` \ - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ . $(DOCKER) build -t $(ORG)/base:$(TAG) \ --build-arg IMAGE=$(ORG)/base \ --build-arg VERSION=$(TAG) \ - --build-arg VCS_REF=`git rev-parse --short HEAD` \ --build-arg VCS_URL=`git config --get remote.origin.url` \ - --build-arg BUILD_DATE=`date -u +"%Y-%m-%dT%H:%M:%SZ"` \ . base.test: base