From 1478389517a3f0a67afb70222c29d7598e65ac87 Mon Sep 17 00:00:00 2001 From: olblak Date: Fri, 12 May 2017 10:55:08 +0200 Subject: [PATCH] Use opendjdk docker image instead of java:8 --- Jenkinsfile | 2 +- Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 58740cc..b34e390 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,7 +11,7 @@ node('docker') { stage('Build') { timestamps { checkout scm - docker.image('java:8').inside { + docker.image('openjdk:8-jdk').inside { sh './gradlew --no-daemon --info war' archiveArtifacts artifacts: 'build/libs/*.war', fingerprint: true } diff --git a/Makefile b/Makefile index 8a85656..4d242da 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,11 @@ current_dir := $(shell pwd) current_user := $(shell id -u) build: - docker run --rm -v $(current_dir):/opt/accountapp/ -u $(current_user):$(current_user) -w /opt/accountapp --entrypoint ./gradlew java:8 --no-daemon --info war + docker run --rm -v $(current_dir):/opt/accountapp/ -u $(current_user):$(current_user) -w /opt/accountapp --entrypoint ./gradlew openjdk:8-jdk --no-daemon --info war docker-compose build run clean: - docker run --rm -v $(current_dir):/opt/accountapp/ -u $(current_user):$(current_user) -w /opt/accountapp --entrypoint ./gradlew java:8 clean + docker run --rm -v $(current_dir):/opt/accountapp/ -u $(current_user):$(current_user) -w /opt/accountapp --entrypoint ./gradlew openjdk:8-jdk clean docker-compose rm -f run run: