From 563f10b7ebc9a5f7826459fb0baa32c9249b9b6b Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Sun, 16 Feb 2020 02:18:23 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs See spinnaker/buildtool#14 --- Dockerfile.compile | 18 ++++++++++++------ Dockerfile.java8 | 6 +++--- Dockerfile.slim | 4 ++-- Dockerfile.ubuntu | 7 +++---- Dockerfile.ubuntu-java8 | 7 +++---- 5 files changed, 23 insertions(+), 19 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index fefe67db2..faa2445a0 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 echo-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 echo-web:installDist -x test diff --git a/Dockerfile.java8 b/Dockerfile.java8 index 7cf8013c2..0ce7b5ca0 100644 --- a/Dockerfile.java8 +++ b/Dockerfile.java8 @@ -1,8 +1,8 @@ # Not using the alpine image because it lacks a package gRPC needed to establish pub/sub listeners. FROM openjdk:8 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo +MAINTAINER sig-platform@spinnaker.io +COPY echo-web/build/install/echo /opt/echo RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/echo/bin/echo"] \ No newline at end of file +CMD ["/opt/echo/bin/echo"] diff --git a/Dockerfile.slim b/Dockerfile.slim index bc2598b65..485fde808 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,7 +1,7 @@ # Not using the alpine image because it lacks a package gRPC needed to establish pub/sub listeners. FROM openjdk:11 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo +MAINTAINER sig-platform@spinnaker.io +COPY echo-web/build/install/echo /opt/echo RUN adduser --disabled-login --system spinnaker USER spinnaker diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 926e7321a..59ec4ef1d 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,8 +1,7 @@ - FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo +MAINTAINER sig-platform@spinnaker.io +COPY echo-web/build/install/echo /opt/echo RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/echo/bin/echo"] \ No newline at end of file +CMD ["/opt/echo/bin/echo"] diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8 index 44d3c93c6..96d9d3bf8 100644 --- a/Dockerfile.ubuntu-java8 +++ b/Dockerfile.ubuntu-java8 @@ -1,8 +1,7 @@ - FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/echo-web/build/install/echo /opt/echo +MAINTAINER sig-platform@spinnaker.io +COPY echo-web/build/install/echo /opt/echo RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/echo/bin/echo"] \ No newline at end of file +CMD ["/opt/echo/bin/echo"]