From 83503817549562fe7ec1de261d3270decd281043 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Sun, 11 Jul 2021 09:43:05 -0700 Subject: [PATCH] fix the scripts path in cic-eth --- apps/cic-eth/docker/Dockerfile | 4 ++-- apps/cic-eth/docker/Dockerfile_ci | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index 8d0028f..f421aa0 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -35,7 +35,7 @@ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ #COPY util/liveness/health.sh /usr/local/bin/health.sh ENTRYPOINT [] -# --- RUNTIME --- +# ------------------ PRODUCTION CONTAINER ---------------------- FROM python:3.8.6-slim-buster as prod RUN apt-get update && \ @@ -56,7 +56,7 @@ RUN chmod 755 *.sh COPY config/ /usr/local/etc/cic-eth/ COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ -COPY scripts/ . +COPY scripts/ scripts/ # TODO this kind of code sharing across projects should be discouraged...can we make util a library? #COPY util/liveness/health.sh /usr/local/bin/health.sh diff --git a/apps/cic-eth/docker/Dockerfile_ci b/apps/cic-eth/docker/Dockerfile_ci index cbdb7fb..606752f 100644 --- a/apps/cic-eth/docker/Dockerfile_ci +++ b/apps/cic-eth/docker/Dockerfile_ci @@ -33,13 +33,13 @@ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ #COPY util/liveness/health.sh /usr/local/bin/health.sh ENTRYPOINT [] -# --- RUNTIME --- -FROM python:3.8.6-slim-buster as runtime +# ------------------ PRODUCTION CONTAINER ---------------------- +FROM python:3.8.6-slim-buster as prod RUN apt-get update && \ apt install -y gnupg libpq-dev procps -WORKDIR /usr/src/cic-eth +WORKDIR /root COPY --from=dev /usr/local/bin/ /usr/local/bin/ COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ @@ -54,6 +54,7 @@ RUN chmod 755 *.sh COPY config/ /usr/local/etc/cic-eth/ COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ +COPY scripts/ scripts/ # TODO this kind of code sharing across projects should be discouraged...can we make util a library? #COPY util/liveness/health.sh /usr/local/bin/health.sh