chore(build): Update Dockerfiles for new cloudbuild configs

See spinnaker/buildtool#14
plumpy · Feb 18, 2020 · 47b8c38 · 47b8c38
1 parent 87ed712
commit 47b8c38
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 14 deletions.
diff --git 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 gate-web:installDist -x test
+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 gate-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/gate-web/build/install/gate /opt/gate
+MAINTAINER sig-platform@spinnaker.io
+COPY gate-web/build/install/gate /opt/gate
 RUN apk --no-cache add --update bash openjdk8-jre
 RUN adduser -D -S spinnaker
 USER spinnaker

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/gate-web/build/install/gate /opt/gate
+MAINTAINER sig-platform@spinnaker.io
+COPY gate-web/build/install/gate /opt/gate
 RUN apk --no-cache add --update bash openjdk11-jre
 RUN adduser -D -S spinnaker
 USER spinnaker

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/gate-web/build/install/gate /opt/gate
+MAINTAINER sig-platform@spinnaker.io
+COPY gate-web/build/install/gate /opt/gate
 RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
 USER spinnaker

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/gate-web/build/install/gate /opt/gate
+MAINTAINER sig-platform@spinnaker.io
+COPY gate-web/build/install/gate /opt/gate
 RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
 RUN adduser --disabled-login --system spinnaker
 USER spinnaker