Skip to content

Commit

Permalink
chore(build): Update Dockerfiles for new cloudbuild configs
Browse files Browse the repository at this point in the history
See spinnaker/buildtool#14

I forgot this one.
  • Loading branch information
plumpy committed Feb 25, 2020
1 parent 85d4362 commit 4f6ef1b
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
8 changes: 5 additions & 3 deletions Dockerfile.compile
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
FROM alpine:3.7
MAINTAINER delivery-engineering@netflix.com
COPY ./spinnaker-monitoring-daemon /compiled_sources
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
6 changes: 3 additions & 3 deletions Dockerfile.slim
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.ubuntu
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"]
CMD ["--config", "/opt/spinnaker-monitoring/config/spinnaker-monitoring.yml", "monitor"]

0 comments on commit 4f6ef1b

Please sign in to comment.