Skip to content

Commit 4e4a9bd

Browse files
committed
chore: align Makefile Docker variables
1 parent d906a4f commit 4e4a9bd

1 file changed

Lines changed: 16 additions & 13 deletions

File tree

Makefile

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
IMAGE_PREFIX ?= dockette
1+
DOCKER_IMAGE_PREFIX?=dockette
2+
DOCKER_TAG?=latest
23
IMAGES := jdk8 mvn openjdk-mvn openjdk8
34

45
.PHONY: build test run $(addprefix build-,$(IMAGES)) $(addprefix test-,$(IMAGES)) $(addprefix run-,$(IMAGES))
@@ -9,37 +10,39 @@ test: $(addprefix test-,$(IMAGES))
910
run: run-openjdk8
1011

1112
build-jdk8:
12-
docker build -t $(IMAGE_PREFIX)/jdk8:latest jdk8
13+
docker build -t ${DOCKER_IMAGE_PREFIX}/jdk8:${DOCKER_TAG} jdk8
1314

1415
build-mvn:
15-
docker build -t $(IMAGE_PREFIX)/mvn:latest mvn
16+
docker build -t ${DOCKER_IMAGE_PREFIX}/mvn:${DOCKER_TAG} mvn
1617

1718
build-openjdk-mvn:
18-
docker build -t $(IMAGE_PREFIX)/openjdk-mvn:latest openjdk-mvn
19+
docker build -t ${DOCKER_IMAGE_PREFIX}/openjdk-mvn:${DOCKER_TAG} openjdk-mvn
1920

2021
build-openjdk8:
21-
docker build -t $(IMAGE_PREFIX)/openjdk8:latest openjdk8
22+
docker build -t ${DOCKER_IMAGE_PREFIX}/openjdk8:${DOCKER_TAG} openjdk8
2223

2324
test-jdk8:
24-
docker run --rm $(IMAGE_PREFIX)/jdk8:latest java -version
25+
docker run --rm ${DOCKER_IMAGE_PREFIX}/jdk8:${DOCKER_TAG} java -version
2526

2627
test-mvn:
27-
docker run --rm $(IMAGE_PREFIX)/mvn:latest sh -lc 'java -version && mvn -version'
28+
docker run --rm ${DOCKER_IMAGE_PREFIX}/mvn:${DOCKER_TAG} java -version
29+
docker run --rm ${DOCKER_IMAGE_PREFIX}/mvn:${DOCKER_TAG} mvn -version
2830

2931
test-openjdk-mvn:
30-
docker run --rm $(IMAGE_PREFIX)/openjdk-mvn:latest sh -lc 'java -version && mvn -version'
32+
docker run --rm ${DOCKER_IMAGE_PREFIX}/openjdk-mvn:${DOCKER_TAG} java -version
33+
docker run --rm ${DOCKER_IMAGE_PREFIX}/openjdk-mvn:${DOCKER_TAG} mvn -version
3134

3235
test-openjdk8:
33-
docker run --rm $(IMAGE_PREFIX)/openjdk8:latest java -version
36+
docker run --rm ${DOCKER_IMAGE_PREFIX}/openjdk8:${DOCKER_TAG} java -version
3437

3538
run-jdk8:
36-
docker run --rm -it -v $(PWD):/data $(IMAGE_PREFIX)/jdk8:latest java -version
39+
docker run --rm -it -v "$${PWD}:/data" ${DOCKER_IMAGE_PREFIX}/jdk8:${DOCKER_TAG} java -version
3740

3841
run-mvn:
39-
docker run --rm -it -v $(PWD):/data $(IMAGE_PREFIX)/mvn:latest
42+
docker run --rm -it -v "$${PWD}:/data" ${DOCKER_IMAGE_PREFIX}/mvn:${DOCKER_TAG}
4043

4144
run-openjdk-mvn:
42-
docker run --rm -it -v $(PWD):/data $(IMAGE_PREFIX)/openjdk-mvn:latest
45+
docker run --rm -it -v "$${PWD}:/data" ${DOCKER_IMAGE_PREFIX}/openjdk-mvn:${DOCKER_TAG}
4346

4447
run-openjdk8:
45-
docker run --rm -it -v $(PWD):/data $(IMAGE_PREFIX)/openjdk8:latest java -version
48+
docker run --rm -it -v "$${PWD}:/data" ${DOCKER_IMAGE_PREFIX}/openjdk8:${DOCKER_TAG} java -version

0 commit comments

Comments
 (0)