From 38683f4f5697a61fac9d2893293e8e6cf570fc8f Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Mon, 24 Feb 2020 21:31:14 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs (#3450) * chore(build): Update Dockerfiles for new cloudbuild configs See spinnaker/buildtool#14 * chore(dockerfile): use openjdk:8 instead of rolling our own --- Dockerfile.compile | 11 +++++------ Dockerfile.slim | 4 ++-- Dockerfile.ubuntu | 4 ++-- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index 3ae8e56bed..8740c9bd6b 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,6 +1,5 @@ -FROM gcr.io/spinnaker-marketplace/gradle_cache -MAINTAINER delivery-engineering@netflix.com -ENV GRADLE_USER_HOME /gradle_cache/.gradle -COPY . compiled_sources -WORKDIR compiled_sources -RUN ./gradlew --no-daemon orca-web:installDist -x test \ No newline at end of file +FROM openjdk:8 +MAINTAINER sig-platform@spinnaker.io +ENV GRADLE_USER_HOME /workspace/.gradle +ENV GRADLE_OPTS -Xmx2048m +CMD ./gradlew --no-daemon orca-web:installDist -x test diff --git a/Dockerfile.slim b/Dockerfile.slim index 07208af4d7..bc1d14e25e 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,6 +1,6 @@ FROM alpine:3.11 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/orca-web/build/install/orca /opt/orca +MAINTAINER sig-platform@spinnaker.io +COPY orca-web/build/install/orca /opt/orca RUN apk --no-cache add --update bash openjdk8-jre RUN adduser -D -S spinnaker RUN mkdir plugins && chown -R 100:100 plugins diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index c4dc980b87..4a7f8e064e 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,6 +1,6 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/orca-web/build/install/orca /opt/orca +MAINTAINER sig-platform@spinnaker.io +COPY orca-web/build/install/orca /opt/orca RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget RUN adduser --disabled-login --system spinnaker RUN mkdir plugins && chown -R 102:nogroup plugins