rtyler
/
account-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use opendjdk docker image instead of java:8

This commit is contained in:
olblak 2017-05-12 10:55:08 +02:00
parent ca26e2bae4
commit 1478389517
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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
}

4
Makefile
View File

@ -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: