Merge pull request #7914 from plumpy/container_builds

chore(build): Update Dockerfiles for new cloudbuild configs
spinnaker · Feb 25, 2020 · ccbdbee · ccbdbee
2 parents f488ddf + 207c6a1
commit ccbdbee
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Dockerfile.compile b/Dockerfile.compile
@@ -1,8 +1,5 @@
-FROM gcr.io/spinnaker-marketplace/gradle_cache
-MAINTAINER [email protected]
-
-ENV GRADLE_USER_HOME /gradle_cache/.gradle
-COPY . compiled_sources
-WORKDIR compiled_sources
-
-RUN ./gradlew build --no-daemon -PskipTests
+FROM openjdk:8
+MAINTAINER [email protected]
+ENV GRADLE_USER_HOME /workspace/.gradle
+ENV GRADLE_OPTS -Xmx2048m
+CMD ./gradlew build --no-daemon -PskipTests
diff --git a/Dockerfile.slim b/Dockerfile.slim
@@ -1,7 +1,8 @@
 FROM debian:stable-slim
-MAINTAINER [email protected]
-COPY --from=compile /compiled_sources/build/webpack /opt/deck/html
-COPY --from=compile /compiled_sources/docker        /opt/deck/docker
+MAINTAINER [email protected]
+
+COPY build/webpack /opt/deck/html
+COPY docker        /opt/deck/docker
 WORKDIR /opt/deck
 
 RUN docker/setup-apache2.sh

diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu
@@ -1,7 +1,8 @@
 FROM ubuntu:bionic
-MAINTAINER [email protected]
-COPY --from=compile /compiled_sources/build/webpack /opt/deck/html
-COPY --from=compile /compiled_sources/docker        /opt/deck/docker
+MAINTAINER [email protected]
+
+COPY build/webpack /opt/deck/html
+COPY docker        /opt/deck/docker
 WORKDIR /opt/deck
 
 RUN docker/setup-apache2.sh