Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs
Browse files Browse the repository at this point in the history
  • Loading branch information
plumpy committed Feb 18, 2020
1 parent 9de2446 commit 31f3f85
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 12 deletions.
Empty file added .gcloudignore
Empty file.
17 changes: 11 additions & 6 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -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
7 changes: 4 additions & 3 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit 31f3f85

Please sign in to comment.