Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(build): Update Dockerfiles for new cloudbuild configs #562

Merged
merged 2 commits into from
Feb 25, 2020
Merged

chore(build): Update Dockerfiles for new cloudbuild configs #562

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
76179b5
chore(build): Update Dockerfiles for new cloudbuild configs
plumpy Feb 16, 2020
14008cf
Merge branch 'master' into container_builds
ajordens Feb 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions Dockerfile.compile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 --no-daemon fiat-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 --no-daemon fiat-web:installDist -x test
4 changes: 2 additions & 2 deletions Dockerfile.java8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
MAINTAINER sig-platform@spinnaker.io
COPY fiat-web/build/install/fiat /opt/fiat
RUN apk --no-cache add --update bash openjdk8-jre
RUN adduser -D -S spinnaker
USER spinnaker
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile.slim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM alpine:3.11
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
MAINTAINER sig-platform@spinnaker.io
COPY fiat-web/build/install/fiat /opt/fiat
RUN apk --no-cache add --update bash openjdk11-jre
RUN adduser -D -S spinnaker
USER spinnaker
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
MAINTAINER sig-platform@spinnaker.io
COPY fiat-web/build/install/fiat /opt/fiat
RUN apt-get update && apt-get -y install openjdk-11-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/fiat/bin/fiat"]
CMD ["/opt/fiat/bin/fiat"]
6 changes: 3 additions & 3 deletions Dockerfile.ubuntu-java8
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/fiat-web/build/install/fiat /opt/fiat
MAINTAINER sig-platform@spinnaker.io
COPY fiat-web/build/install/fiat /opt/fiat
RUN apt-get update && apt-get -y install openjdk-8-jre-headless wget
RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/fiat/bin/fiat"]
CMD ["/opt/fiat/bin/fiat"]