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 #4332

Merged
merged 2 commits into from
Feb 25, 2020
Merged

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

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
9176a46
chore(build): Update Dockerfiles for new cloudbuild configs
plumpy Feb 14, 2020
fa6321f
chore(dockerfile): use openjdk:8 instead of rolling our own
plumpy Feb 19, 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
13 changes: 5 additions & 8 deletions Dockerfile.compile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
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 clouddriver-web:installDist -x test
FROM openjdk:8
MAINTAINER sig-platform@spinnaker.io
ENV GRADLE_USER_HOME /workspace/.gradle
ENV GRADLE_OPTS -Xmx2048m
CMD ./gradlew clouddriver-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/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

ENV KUBECTL_VERSION v1.16.0

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/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

ENV KUBECTL_VERSION v1.16.0

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,6 +1,6 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

RUN apt-get update && apt-get install -y curl gnupg && \
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand All @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/clouddriver/bin/clouddriver"]
CMD ["/opt/clouddriver/bin/clouddriver"]
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,6 +1,6 @@
FROM ubuntu:bionic
MAINTAINER delivery-engineering@netflix.com
COPY --from=compile /compiled_sources/clouddriver-web/build/install/clouddriver /opt/clouddriver
MAINTAINER sig-platform@spinnaker.io
COPY clouddriver-web/build/install/clouddriver /opt/clouddriver

RUN apt-get update && apt-get install -y curl gnupg && \
curl -s https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - && \
Expand All @@ -23,4 +23,4 @@ RUN curl -o /usr/local/bin/aws-iam-authenticator https://amazon-eks.s3-us-west-

RUN adduser --disabled-login --system spinnaker
USER spinnaker
CMD ["/opt/clouddriver/bin/clouddriver"]
CMD ["/opt/clouddriver/bin/clouddriver"]