just another empty line

This commit is contained in:
Wolfgang Hottgenroth 2020-09-26 12:11:43 +02:00
parent 1b203fb644
commit f765449d13
Signed by: wn
GPG Key ID: B586EAFCDF2F65F4
2 changed files with 14 additions and 35 deletions

View File

@ -1,26 +1,4 @@
image: docker:stable include:
- project: dockerized/commons
stages: ref: master
- build file: gitlab-ci-template.yml
variables:
IMAGE_NAME: registry.hottis.de/dockerized/build-env-java
HUB_IMAGE_NAME: wollud1969/build-env-java
build:
stage: build
tags:
- hottis
- linux
- docker
script:
- VERSION=`cat VERSION`
- docker build --tag $IMAGE_NAME:latest --tag $IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:$VERSION --tag $HUB_IMAGE_NAME:latest .
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $IMAGE_NAME:latest
- docker push $IMAGE_NAME:$VERSION
- docker login -u $DOCKER_HUB_LOGIN -p $DOCKER_HUB_PASSWORD
- docker push $HUB_IMAGE_NAME:latest
- docker push $HUB_IMAGE_NAME:$VERSION

View File

@ -6,13 +6,14 @@ LABEL AlternativeImageName="wollud1969/build-env-java"
RUN apt update RUN \
RUN apt install -y software-properties-common apt update && \
RUN curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public > adoptopenjdk.key apt install -y software-properties-common && \
RUN apt-key add adoptopenjdk.key curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public > adoptopenjdk.key && \
RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ apt-key add adoptopenjdk.key && \
RUN apt update add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \
RUN apt install -y adoptopenjdk-8-hotspot apt update && \
RUN apt install -y maven apt install -y adoptopenjdk-8-hotspot && \
RUN rm -rf /var/lib/apt/lists/* apt install -y maven && \
rm -rf /var/lib/apt/lists/*