From cf96e04be2690b4b18db1dd297c9ad07948a817d Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Fri, 14 Feb 2020 14:10:09 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for spinnaker/buildtool#14 --- Dockerfile.compile | 16 ++++++++++------ Dockerfile.java8 | 4 ++-- Dockerfile.slim | 4 ++-- Dockerfile.ubuntu | 6 +++--- Dockerfile.ubuntu-java8 | 6 +++--- 5 files changed, 20 insertions(+), 16 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index 4d737c54708..8ec55a6cddd 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,8 +1,12 @@ -FROM gcr.io/spinnaker-marketplace/gradle_cache -MAINTAINER delivery-engineering@netflix.com +FROM ubuntu:eoan +MAINTAINER sig-platform@spinnaker.io -ENV GRADLE_USER_HOME /gradle_cache/.gradle -COPY . compiled_sources -WORKDIR compiled_sources +RUN apt-get update \ + && apt-get -y upgrade \ + && apt-get install -y \ + openjdk-8-jdk-headless \ + && apt-get clean -RUN ./gradlew clouddriver-web:installDist -x test +ENV GRADLE_USER_HOME /workspace/.gradle +ENV GRADLE_OPTS -Xmx2048m +CMD ./gradlew clouddriver-web:installDist -x test diff --git a/Dockerfile.java8 b/Dockerfile.java8 index 7d038bdac2e..783e1249d3c 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/clouddriver-web/build/install/clouddriver /opt/clouddriver +MAINTAINER sig-platform@spinnaker.io +COPY clouddriver-web/build/install/clouddriver /opt/clouddriver ENV KUBECTL_VERSION v1.16.0 diff --git a/Dockerfile.slim b/Dockerfile.slim index ce9a51e825f..67388d15739 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/clouddriver-web/build/install/clouddriver /opt/clouddriver +MAINTAINER sig-platform@spinnaker.io +COPY clouddriver-web/build/install/clouddriver /opt/clouddriver ENV KUBECTL_VERSION v1.16.0 diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 6c16b61e0bd..0032e438441 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,6 +1,6 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver +MAINTAINER sig-platform@spinnaker.io +COPY clouddriver-web/build/install/clouddriver /opt/clouddriver RUN apt-get update && apt-get install -y curl gnupg && \ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west- RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/clouddriver/bin/clouddriver"] \ No newline at end of file +CMD ["/opt/clouddriver/bin/clouddriver"] diff --git a/Dockerfile.ubuntu-java8 b/Dockerfile.ubuntu-java8 index a84da781777..2d9905c97d6 100644 --- a/Dockerfile.ubuntu-java8 +++ b/Dockerfile.ubuntu-java8 @@ -1,6 +1,6 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver +MAINTAINER sig-platform@spinnaker.io +COPY clouddriver-web/build/install/clouddriver /opt/clouddriver RUN apt-get update && apt-get install -y curl gnupg && \ curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \ @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west- RUN adduser --disabled-login --system spinnaker USER spinnaker -CMD ["/opt/clouddriver/bin/clouddriver"] \ No newline at end of file +CMD ["/opt/clouddriver/bin/clouddriver"]