unboundsoftware/java_cet_plus_fonts
Archived
6
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Activity

chore: update to java 11 and build-tools

Browse Source
This commit is contained in:
Joakim Olsson
2019-11-28 23:08:35 +01:00
parent 564e2fd872
commit d6e6fdbe75
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+3 -7
View File
@@ -1,12 +1,8 @@
job1: job1:
stage: build stage: build
image: docker image: buildtool/build-tools:0.0.6
services: services:
- docker:dind - docker:dind
script: script:
- docker version - build
- docker build --cache-from $CI_REGISTRY_IMAGE:latest -t $CI_REGISTRY_IMAGE:latest . - push
- 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
Dockerfile
+1 -2
View File
@@ -1,4 +1,4 @@
FROM pliljenberg/java FROM openjdk:11
MAINTAINER Joakim Olsson <joakim@unbound.se> MAINTAINER Joakim Olsson <joakim@unbound.se>
RUN apt-get update \ 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 && rm /tmp/msttfont.deb
RUN echo "Europe/Stockholm" > /etc/timezone; dpkg-reconfigure -f noninteractive tzdata RUN echo "Europe/Stockholm" > /etc/timezone; dpkg-reconfigure -f noninteractive tzdata