From 1455743404225d60d7f9da8f8369e337daeb693f Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Mon, 24 Feb 2020 21:31:16 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs (#533) * 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.java8 | 8 ++++---- Dockerfile.slim | 8 ++++---- Dockerfile.ubuntu | 8 ++++---- Dockerfile.ubuntu-java8 | 8 ++++---- 5 files changed, 21 insertions(+), 22 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index 39b8a3dd2a..b66445f383 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 rosco-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 rosco-web:installDist -x test diff --git a/Dockerfile.java8 b/Dockerfile.java8 index 38cff64bbc..ce936536ef 100644 --- a/Dockerfile.java8 +++ b/Dockerfile.java8 @@ -1,8 +1,8 @@ FROM alpine:3.11 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer +MAINTAINER sig-platform@spinnaker.io +COPY rosco-web/build/install/rosco /opt/rosco +COPY rosco-web/config /opt/rosco +COPY rosco-web/config/packer /opt/rosco/config/packer WORKDIR /packer diff --git a/Dockerfile.slim b/Dockerfile.slim index 714c214712..6ce05e9a4f 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,8 +1,8 @@ FROM alpine:3.11 -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer +MAINTAINER sig-platform@spinnaker.io +COPY rosco-web/build/install/rosco /opt/rosco +COPY rosco-web/config /opt/rosco +COPY rosco-web/config/packer /opt/rosco/config/packer WORKDIR /packer diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index db7a89dc7e..056ff93364 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,8 +1,8 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer +MAINTAINER sig-platform@spinnaker.io +COPY rosco-web/build/install/rosco /opt/rosco +COPY rosco-web/config /opt/rosco +COPY rosco-web/config/packer /opt/rosco/config/packer WORKDIR /packer diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8 index 358df8c4f1..193c243ca7 100644 --- a/Dockerfile.ubuntu-java8 +++ b/Dockerfile.ubuntu-java8 @@ -1,8 +1,8 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/rosco-web/build/install/rosco /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config /opt/rosco -COPY --from=compile /compiled_sources/rosco-web/config/packer /opt/rosco/config/packer +MAINTAINER sig-platform@spinnaker.io +COPY rosco-web/build/install/rosco /opt/rosco +COPY rosco-web/config /opt/rosco +COPY rosco-web/config/packer /opt/rosco/config/packer WORKDIR /packer