From 85a8e377fc9a4fdf916fc9ff0dc202f563ce1b61 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Wed, 17 Apr 2019 11:21:41 +0200 Subject: [PATCH 1/2] [docker] use a base image that already contains maven and openjdk Signed-off-by: Jakob Ackermann --- services/git-bridge/Dockerfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile index a8b16e79f2..2816e64934 100644 --- a/services/git-bridge/Dockerfile +++ b/services/git-bridge/Dockerfile @@ -1,16 +1,5 @@ # Dockerfile for git-bridge +FROM maven:3-jdk-8 -FROM ubuntu:latest - - -RUN apt-get update && \ - apt-get install -y git make maven openjdk-8-jdk curl && \ - update-alternatives --install /usr/bin/java java /usr/lib/jvm/java-8-openjdk-amd64/bin/java 100 && \ - update-alternatives --install /usr/bin/javac javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac 100 && \ - update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/bin/java && \ - update-alternatives --set javac /usr/lib/jvm/java-8-openjdk-amd64/bin/javac - - -RUN mkdir /app -WORKDIR /app \ No newline at end of file +WORKDIR /app From c3308e565b8d213d36662deb702da0fc91af40e1 Mon Sep 17 00:00:00 2001 From: Shane Kilkelly Date: Fri, 26 Apr 2019 15:29:44 +0100 Subject: [PATCH 2/2] Add git, make, and curl to docker image --- services/git-bridge/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/services/git-bridge/Dockerfile b/services/git-bridge/Dockerfile index 2816e64934..a309040d63 100644 --- a/services/git-bridge/Dockerfile +++ b/services/git-bridge/Dockerfile @@ -2,4 +2,6 @@ FROM maven:3-jdk-8 +RUN apt-get update && apt-get install -y make git curl + WORKDIR /app