chore: update to java 11 and build-tools
This commit is contained in:
+3
-7
@@ -1,12 +1,8 @@
|
||||
job1:
|
||||
stage: build
|
||||
image: docker
|
||||
image: buildtool/build-tools:0.0.6
|
||||
services:
|
||||
- docker:dind
|
||||
script:
|
||||
- docker version
|
||||
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest .
|
||||
- docker tag $CI_REGISTRY_IMAGE:latest $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY
|
||||
- docker push $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
|
||||
- docker push $CI_REGISTRY_IMAGE:latest
|
||||
- build
|
||||
- push
|
||||
|
||||
+1
-2
@@ -1,4 +1,4 @@
|
||||
FROM pliljenberg/java
|
||||
FROM openjdk:11
|
||||
MAINTAINER Joakim Olsson <joakim@unbound.se>
|
||||
|
||||
RUN apt-get update \
|
||||
@@ -11,4 +11,3 @@ RUN curl -SL http://ftp.se.debian.org/debian/pool/contrib/m/msttcorefonts/ttf-ms
|
||||
&& rm /tmp/msttfont.deb
|
||||
|
||||
RUN echo "Europe/Stockholm" > /etc/timezone; dpkg-reconfigure -f noninteractive tzdata
|
||||
|
||||
|
||||
Reference in New Issue
Block a user