From 266bc3362da6f0a43550f68327671104639ba4b1 Mon Sep 17 00:00:00 2001 From: Blair Vanderlugt Date: Sun, 11 Jul 2021 09:51:08 -0700 Subject: [PATCH] just remove the cic-eth slim image for rn --- apps/cic-eth/docker/Dockerfile | 54 +++++++++++++++---------------- apps/cic-eth/docker/Dockerfile_ci | 54 +++++++++++++++---------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/apps/cic-eth/docker/Dockerfile b/apps/cic-eth/docker/Dockerfile index f421aa0d..1af28dc0 100644 --- a/apps/cic-eth/docker/Dockerfile +++ b/apps/cic-eth/docker/Dockerfile @@ -35,31 +35,31 @@ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ #COPY util/liveness/health.sh /usr/local/bin/health.sh ENTRYPOINT [] -# ------------------ PRODUCTION CONTAINER ---------------------- -FROM python:3.8.6-slim-buster as prod - -RUN apt-get update && \ - apt install -y gnupg libpq-dev procps - -WORKDIR /root - -COPY --from=dev /usr/local/bin/ /usr/local/bin/ -COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ - /usr/local/lib/python3.8/site-packages/ - -COPY docker/entrypoints/* ./ -RUN chmod 755 *.sh - -# # ini files in config directory defines the configurable parameters for the application -# # they can all be overridden by environment variables -# # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) -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 - -ENTRYPOINT [] +## ------------------ PRODUCTION CONTAINER ---------------------- +#FROM python:3.8.6-slim-buster as prod +# +#RUN apt-get update && \ +# apt install -y gnupg libpq-dev procps +# +#WORKDIR /root +# +#COPY --from=dev /usr/local/bin/ /usr/local/bin/ +#COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ +# /usr/local/lib/python3.8/site-packages/ +# +#COPY docker/entrypoints/* ./ +#RUN chmod 755 *.sh +# +## # ini files in config directory defines the configurable parameters for the application +## # they can all be overridden by environment variables +## # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) +#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 +# +#ENTRYPOINT [] diff --git a/apps/cic-eth/docker/Dockerfile_ci b/apps/cic-eth/docker/Dockerfile_ci index 606752f5..27955b32 100644 --- a/apps/cic-eth/docker/Dockerfile_ci +++ b/apps/cic-eth/docker/Dockerfile_ci @@ -34,30 +34,30 @@ COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ ENTRYPOINT [] # ------------------ PRODUCTION CONTAINER ---------------------- -FROM python:3.8.6-slim-buster as prod - -RUN apt-get update && \ - apt install -y gnupg libpq-dev procps - -WORKDIR /root - -COPY --from=dev /usr/local/bin/ /usr/local/bin/ -COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ - /usr/local/lib/python3.8/site-packages/ - -COPY docker/entrypoints/* ./ -RUN chmod 755 *.sh - -# # ini files in config directory defines the configurable parameters for the application -# # they can all be overridden by environment variables -# # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) -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 - -ENTRYPOINT [] - +#FROM python:3.8.6-slim-buster as prod +# +#RUN apt-get update && \ +# apt install -y gnupg libpq-dev procps +# +#WORKDIR /root +# +#COPY --from=dev /usr/local/bin/ /usr/local/bin/ +#COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ +# /usr/local/lib/python3.8/site-packages/ +# +#COPY docker/entrypoints/* ./ +#RUN chmod 755 *.sh +# +## # ini files in config directory defines the configurable parameters for the application +## # they can all be overridden by environment variables +## # to generate a list of environment variables from configuration, use: confini-dump -z (executable provided by confini package) +#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 +# +#ENTRYPOINT [] +#