chore(build): Update Dockerfiles for spinnaker/buildtool#14

spinnaker · Feb 18, 2020 · cf96e04 · cf96e04
1 parent f89de41
commit cf96e04
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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"]
+CMD ["/opt/clouddriver/bin/clouddriver"]
diff --git 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"]
+CMD ["/opt/clouddriver/bin/clouddriver"]