kamikazechaser/cic-internal-integration
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix the scripts path in cic-eth

Browse Source
This commit is contained in:
Blair Vanderlugt 2021-07-11 09:43:05 -07:00
parent 6ddeacf036
commit 8350381754
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/cic-eth/docker/Dockerfile
View File

@ -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 #COPY util/liveness/health.sh /usr/local/bin/health.sh
ENTRYPOINT [] ENTRYPOINT []
# --- RUNTIME --- # ------------------ PRODUCTION CONTAINER ----------------------
FROM python:3.8.6-slim-buster as prod FROM python:3.8.6-slim-buster as prod
RUN apt-get update && \ RUN apt-get update && \
@ -56,7 +56,7 @@ RUN chmod 755 *.sh
COPY config/ /usr/local/etc/cic-eth/ COPY config/ /usr/local/etc/cic-eth/
COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ 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? # 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 #COPY util/liveness/health.sh /usr/local/bin/health.sh

7
apps/cic-eth/docker/Dockerfile_ci
View File

@ -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 #COPY util/liveness/health.sh /usr/local/bin/health.sh
ENTRYPOINT [] ENTRYPOINT []
# --- RUNTIME --- # ------------------ PRODUCTION CONTAINER ----------------------
FROM python:3.8.6-slim-buster as runtime FROM python:3.8.6-slim-buster as prod
RUN apt-get update && \ RUN apt-get update && \
apt install -y gnupg libpq-dev procps 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/bin/ /usr/local/bin/
COPY --from=dev /usr/local/lib/python3.8/site-packages/ \ 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 config/ /usr/local/etc/cic-eth/
COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/ COPY cic_eth/db/migrations/ /usr/local/share/cic-eth/alembic/
COPY crypto_dev_signer_config/ /usr/local/etc/crypto-dev-signer/ 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? # 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 #COPY util/liveness/health.sh /usr/local/bin/health.sh