From d953f97d20812c74c06abf4c24ee2be9b6804349 Mon Sep 17 00:00:00 2001
From: Daniel Speicher <daniel.speicher@atticsoftware.de>
Date: Tue, 13 Nov 2018 14:34:00 +0100
Subject: [PATCH] Update Dockerfile with Maven version and install Git.
---
.gitlab-ci.yml | 2 +-
Dockerfile | 11 +++++++++--
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bc62644..819b8b7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,7 @@ before_script:
build-master:
script:
- - docker build --pull -t $CI_REGISTRY_IMAGE/maven ./docker
+ - docker build --pull -t $CI_REGISTRY_IMAGE/maven .
- docker push $CI_REGISTRY_IMAGE/maven
only:
- master
diff --git a/Dockerfile b/Dockerfile
index 9fb5f63..85369d7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,15 @@
-FROM ubuntu:16.04
+FROM maven:3-jdk-11-slim
+
+
LABEL com.example.vendor="PARAGON Executive Service GmbH" \
maintainer="juergen@paragon-es.de" \
version="1.0.0" \
description="Base Ansible image to be built upon by https://gitlab.lakedrops.com/ansible-playbooks/general"
-RUN echo "===> Adding Ansible's prerequisites..."
+RUN echo "===> Adding GIT..." && \
+ apt-get update -y && \
+ apt-get install -y -q git && \
+ echo "Completed"
+
+
--
GitLab