From 76179b5365dd8a724ca3385e237571d30049aabb Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Sun, 16 Feb 2020 02:18:30 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs See spinnaker/buildtool#14 --- Dockerfile.compile | 18 ++++++++++++------ Dockerfile.java8 | 4 ++-- Dockerfile.slim | 4 ++-- Dockerfile.ubuntu | 6 +++--- Dockerfile.ubuntu-java8 | 6 +++--- 5 files changed, 22 insertions(+), 16 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index c80046722..9cdbe5620 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,6 +1,12 @@ -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 fiat-web:installDist -x test \ No newline at end of file +FROM ubuntu:eoan +MAINTAINER sig-platform@spinnaker.io + +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get install -y \ + openjdk-8-jdk-headless \ + && apt-get clean + +ENV GRADLE_USER_HOME /workspace/.gradle +ENV GRADLE_OPTS -Xmx2048m +CMD ./gradlew --no-daemon fiat-web:installDist -x test diff --git a/Dockerfile.java8 b/Dockerfile.java8 index d618a6660..ae892737a 100644 --- a/Dockerfile.java8 +++ b/Dockerfile.java8 @@ -1,6 +1,6 @@ FROM alpine:3.11 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat +MAINTAINER sig-platform@spinnaker.io +COPY fiat-web/build/install/fiat /opt/fiat RUN apk --no-cache add --update bash openjdk8-jre RUN adduser -D -S spinnaker USER spinnaker diff --git a/Dockerfile.slim b/Dockerfile.slim index 2ab7fe17f..a5256b477 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/fiat-web/build/install/fiat /opt/fiat +MAINTAINER sig-platform@spinnaker.io +COPY fiat-web/build/install/fiat /opt/fiat RUN apk --no-cache add --update bash openjdk11-jre RUN adduser -D -S spinnaker USER spinnaker diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index a619fbf66..1fa6d9e23 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,7 +1,7 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat +MAINTAINER sig-platform@spinnaker.io +COPY fiat-web/build/install/fiat /opt/fiat RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/fiat/bin/fiat"] \ No newline at end of file +CMD ["/opt/fiat/bin/fiat"] diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8 index 37b5ffe4d..c69062567 100644 --- a/Dockerfile.ubuntu-java8 +++ b/Dockerfile.ubuntu-java8 @@ -1,7 +1,7 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat +MAINTAINER sig-platform@spinnaker.io +COPY fiat-web/build/install/fiat /opt/fiat RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/fiat/bin/fiat"] \ No newline at end of file +CMD ["/opt/fiat/bin/fiat"]