From f765449d130695de99ad1b70d5672d2c1cee1f1c Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Sat, 26 Sep 2020 12:11:43 +0200
Subject: [PATCH] just another empty line

---
 .gitlab-ci.yml | 30 ++++--------------------------
 Dockerfile     | 19 ++++++++++---------
 2 files changed, 14 insertions(+), 35 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7e30390..9e5f3a9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,26 +1,4 @@
-image: docker:stable
-
-stages:
-        - build
-
-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
-
+include:
+        - project: dockerized/commons
+          ref: master
+          file: gitlab-ci-template.yml
diff --git a/Dockerfile b/Dockerfile
index 3ef59d5..f55e1b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,13 +6,14 @@ LABEL AlternativeImageName="wollud1969/build-env-java"
 
 
 
-RUN apt update 
-RUN apt install -y software-properties-common 
-RUN curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public > adoptopenjdk.key 
-RUN apt-key add adoptopenjdk.key 
-RUN add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ 
-RUN apt update 
-RUN apt install -y adoptopenjdk-8-hotspot 
-RUN apt install -y maven 
-RUN rm -rf /var/lib/apt/lists/*
+RUN \
+  apt update && \
+  apt install -y software-properties-common && \
+  curl https://adoptopenjdk.jfrog.io/adoptopenjdk/api/gpg/key/public > adoptopenjdk.key && \
+  apt-key add adoptopenjdk.key && \
+  add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ && \
+  apt update && \
+  apt install -y adoptopenjdk-8-hotspot && \
+  apt install -y maven && \
+  rm -rf /var/lib/apt/lists/*