cleaned up make files to push latest

bigdatagenomics · Aug 5, 2020 · 8f71457 · 8f71457
1 parent 6598822
commit 8f71457
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 1 deletion.
diff --git a/mango-jenkins/Makefile b/mango-jenkins/Makefile
@@ -2,11 +2,15 @@
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/mango-jenkins
 tag = 0.0.1--${git_commit}
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	cd ../miniconda3-maven3-openjdk8 && make build
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}

diff --git a/maven3-openjdk8-alpine/Makefile b/maven3-openjdk8-alpine/Makefile
@@ -2,10 +2,14 @@
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/maven3-openjdk8-alpine
 tag = 0.0.1--${git_commit}
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}

diff --git a/maven3-openjdk8/Makefile b/maven3-openjdk8/Makefile
@@ -1,11 +1,15 @@
 # Definitions
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/maven3-openjdk8
+build_tool = runtime-container.DONE
 tag = 0.0.1--${git_commit}
 
 # Steps
 build: Dockerfile
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}

diff --git a/miniconda3-maven3-openjdk8/Makefile b/miniconda3-maven3-openjdk8/Makefile
@@ -3,12 +3,15 @@ build_output = ${runtime_path}/miniconda3-maven3-openjdk8
 git_commit ?= $(shell git log --pretty=oneline -n 1 | cut -f1 -d " ")
 name = bigdatagenomics/miniconda3-maven3-openjdk8
 tag = 0.0.1--${git_commit}
-
+build_tool = runtime-container.DONE
 
 # Steps
 build: Dockerfile
 	cd ../maven3-openjdk8 && make build
 	docker build -t ${name}:${tag} .
+	-docker rmi ${name}:latest
+	docker tag ${name}:${tag} ${name}:latest
+	touch ${build_tool}
 
 clean:
 	docker rmi -f ${name}:${tag} ${name}:${tag}