From 4f6ef1b65e47136cfd77ac16fb09cc3967a788d8 Mon Sep 17 00:00:00 2001 From: Michael Plump Date: Tue, 18 Feb 2020 10:40:06 -0500 Subject: [PATCH] chore(build): Update Dockerfiles for new cloudbuild configs See spinnaker/buildtool#14 I forgot this one. --- Dockerfile.compile | 8 +++++--- Dockerfile.slim | 6 +++--- Dockerfile.ubuntu | 8 ++++---- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/Dockerfile.compile b/Dockerfile.compile index f5faa47..cc4711f 100644 --- a/Dockerfile.compile +++ b/Dockerfile.compile @@ -1,3 +1,5 @@ -FROM alpine:3.7 -MAINTAINER delivery-engineering@netflix.com -COPY ./spinnaker-monitoring-daemon /compiled_sources \ No newline at end of file +FROM alpine:3.11.3 +MAINTAINER sig-platform@spinnaker.io +# The save_cache step will fail if these directories don't exist. We don't have +# any compilation to do, so just do this instead of running gradle to save time. +CMD mkdir -p .gradle/caches && mkdir -p .gradle/wrapper diff --git a/Dockerfile.slim b/Dockerfile.slim index d998d84..8c8cdbd 100644 --- a/Dockerfile.slim +++ b/Dockerfile.slim @@ -2,10 +2,10 @@ # config to be mounted in /opt/spinnaker-monitoring/config, which includes the # spinnaker-monitoring.yml file. FROM python:2.7.14-alpine3.7 -MAINTAINER delivery-engineering@netflix.com +MAINTAINER sig-platform@spinnaker.io -COPY --from=compile /compiled_sources/spinnaker-monitoring /opt/spinnaker-monitoring/bin -COPY --from=compile /compiled_sources/requirements.txt /opt/spinnaker-monitoring/requirements.txt +COPY spinnaker-monitoring-daemon/spinnaker-monitoring /opt/spinnaker-monitoring/bin +COPY spinnaker-monitoring-daemon/requirements.txt /opt/spinnaker-monitoring/requirements.txt WORKDIR /opt/spinnaker-monitoring diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 93a4645..68e2dd8 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -2,10 +2,10 @@ # config to be mounted in /opt/spinnaker-monitoring/config, which includes the # spinnaker-monitoring.yml file. FROM ubuntu:bionic -MAINTAINER delivery-engineering@netflix.com +MAINTAINER sig-platform@spinnaker.io -COPY --from=compile /compiled_sources/spinnaker-monitoring /opt/spinnaker-monitoring/bin -COPY --from=compile /compiled_sources/requirements.txt /opt/spinnaker-monitoring/requirements.txt +COPY spinnaker-monitoring-daemon/spinnaker-monitoring /opt/spinnaker-monitoring/bin +COPY spinnaker-monitoring-daemon/requirements.txt /opt/spinnaker-monitoring/requirements.txt RUN apt-get update && apt-get install -y python python2.7 python-pip wget WORKDIR /opt/spinnaker-monitoring @@ -18,4 +18,4 @@ RUN adduser --disabled-login --system --ingroup spinnaker spinnaker USER spinnaker ENTRYPOINT ["python", "/opt/spinnaker-monitoring/bin"] -CMD ["--config", "/opt/spinnaker-monitoring/config/spinnaker-monitoring.yml", "monitor"] \ No newline at end of file +CMD ["--config", "/opt/spinnaker-monitoring/config/spinnaker-monitoring.yml", "monitor"]