From e36b45e619fe97b69e64181954f1a53508a570a5 Mon Sep 17 00:00:00 2001 From: Hugo Thunnissen Date: Wed, 20 Apr 2022 16:20:57 +0200 Subject: [PATCH] Add java/gradle/maven to image --- Dockerfile | 12 ++++++++++++ main.go | 2 -- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index d99c849..e0d4c65 100644 --- a/Dockerfile +++ b/Dockerfile @@ -107,6 +107,18 @@ RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \ golang.org/x/tools/cmd/goimports@latest; do \ /usr/local/go/bin/go install "$package"; done' +RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-17-jdk + +RUN wget https://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip -O /tmp/gradle.zip +RUN unzip -d /opt/ /tmp/gradle.zip +RUN rm /tmp/gradle.zip +RUN ln -sf /opt/gradle-7.4.2/bin/gradle /usr/bin/gradle + +RUN mkdir -p /opt/maven +RUN wget https://dlcdn.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.tar.gz -O - |\ + tar -C /opt/maven --strip-components=1 -xzf - +RUN ln -s /opt/maven/bin/mvn /usr/bin/mvn + ADD . /opt/workspace-repo WORKDIR /opt/workspace-repo RUN /usr/local/go/bin/go build . diff --git a/main.go b/main.go index 12c1dc1..e9a7613 100644 --- a/main.go +++ b/main.go @@ -6,7 +6,6 @@ import ( "errors" "flag" "fmt" - "log" "os" "os/exec" "os/user" @@ -114,7 +113,6 @@ func EntryPoint(command []string) error { } if uid != 0 { - log.Printf("UID: %d", uid) err = AddUser(os.Getenv("WORKSPACE_USERNAME"), uidString) if err != nil { return err