From 31f3f85b33cd9da31697e0159a1b99ffdea48ab5 Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Sun, 16 Feb 2020 02:18:21 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs See spinnaker/buildtool#14 --- .gcloudignore | 0 Dockerfile.compile | 17 +++++++++++------ Dockerfile.slim | 7 ++++--- Dockerfile.ubuntu | 7 ++++--- 4 files changed, 19 insertions(+), 12 deletions(-) create mode 100644 .gcloudignore diff --git a/.gcloudignore b/.gcloudignore new file mode 100644 index 00000000000..e69de29bb2d diff --git a/Dockerfile.compile b/Dockerfile.compile index 7f15ce76e3c..ee7ad9023ee 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,8 +1,13 @@ -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 \ + git + openjdk-8-jdk-headless \ + && apt-get clean -RUN ./gradlew build --no-daemon -PskipTests +ENV GRADLE_USER_HOME /workspace/.gradle +ENV GRADLE_OPTS -Xmx2048m +CMD ./gradlew build --no-daemon -PskipTests diff --git a/Dockerfile.slim b/Dockerfile.slim index 5a5c5e49ecf..f8ea4fe409d 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -1,7 +1,8 @@ FROM debian:stable-slim -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/build/webpack /opt/deck/html -COPY --from=compile /compiled_sources/docker /opt/deck/docker +MAINTAINER sig-platform@spinnaker.io + +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 index 11be6d7cfc3..6bd4b2b0fff 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,7 +1,8 @@ FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com -COPY --from=compile /compiled_sources/build/webpack /opt/deck/html -COPY --from=compile /compiled_sources/docker /opt/deck/docker +MAINTAINER sig-platform@spinnaker.io + +COPY build/webpack /opt/deck/html +COPY docker /opt/deck/docker WORKDIR /opt/deck RUN docker/setup-apache2.sh