use jdk11 for docker build
parent
308b170baa
commit
02547e8ac5
3
Makefile
3
Makefile
|
@ -1,10 +1,11 @@
|
||||||
|
|
||||||
TAG=registry.rudin.io/x86/minetest-tileserver
|
TAG=registry.rudin.io/x86/minetest-tileserver
|
||||||
VOLUMES=-v maven-repo:/root/.m2 -v $(shell pwd)/src:/src -v $(shell pwd)/pom.xml:/pom.xml -v $(shell pwd)/target/docker:/target
|
VOLUMES=-v maven-repo:/root/.m2 -v $(shell pwd)/src:/src -v $(shell pwd)/pom.xml:/pom.xml -v $(shell pwd)/target/docker:/target
|
||||||
|
MAVEN_TAG=maven:3.6-jdk-11
|
||||||
|
|
||||||
build:
|
build:
|
||||||
rm -rf target/docker
|
rm -rf target/docker
|
||||||
docker run -it --rm $(VOLUMES) maven:3.5-jdk-10 mvn install
|
docker run -it --rm $(VOLUMES) -e M3_HOME=/root/.m2 $(MAVEN_TAG) mvn install
|
||||||
docker build . -t $(TAG)
|
docker build . -t $(TAG)
|
||||||
|
|
||||||
push:
|
push:
|
||||||
|
|
6
pom.xml
6
pom.xml
|
@ -167,6 +167,12 @@
|
||||||
<version>3.5.2</version>
|
<version>3.5.2</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
<dependency>
|
||||||
|
<groupId>javax.annotation</groupId>
|
||||||
|
<artifactId>javax.annotation-api</artifactId>
|
||||||
|
<version>1.2</version>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- Testing -->
|
<!-- Testing -->
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.h2database</groupId>
|
<groupId>com.h2database</groupId>
|
||||||
|
|
Loading…
Reference in New Issue