From 9ca469c28a4e1bfd8cab2f13006c2dc0a12526a2 Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 25 Oct 2018 10:17:58 -0400 Subject: [PATCH] restore original dockerfiles --- deploy/docker/prod/Dockerfile | 5 +---- deploy/docker/tester/Dockerfile | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/deploy/docker/prod/Dockerfile b/deploy/docker/prod/Dockerfile index 9055526b..37a36859 100644 --- a/deploy/docker/prod/Dockerfile +++ b/deploy/docker/prod/Dockerfile @@ -21,7 +21,7 @@ EXPOSE "${APP_PORT}" ENTRYPOINT ["/usr/bin/dumb-init", "--"] # Default command is to launch the server -CMD ["bash", "-c", "crond -b && ${APP_DIR}/script/uwsgi_server"] +CMD ["bash", "-c", "${APP_DIR}/script/uwsgi_server"] ### Items that will change almost every build ############################################# @@ -41,9 +41,6 @@ WORKDIR ${APP_DIR} RUN set -x ; \ script/alpine_setup "${APP_USER}" "${APP_GROUP}" -# add sync-crl cronjob for atst user -RUN echo "1 */6 * * * /opt/atat/atst/script/sync-crls tests/crl-tmp" >> /etc/crontabs/atst - # Update file ownership RUN set -x ; \ for subdir in $(find . -type d -maxdepth 1 | grep -Ee '.[^/]' | grep -Fve 'node_modules'); do chown atst:atat -R ${subdir}; done diff --git a/deploy/docker/tester/Dockerfile b/deploy/docker/tester/Dockerfile index 8e350992..5486ffa1 100644 --- a/deploy/docker/tester/Dockerfile +++ b/deploy/docker/tester/Dockerfile @@ -27,9 +27,6 @@ WORKDIR ${APP_DIR} # Copy over setup scripts COPY script/ ./script/ -# add sync-crl cronjob for atst user -RUN echo "1 */6 * * * /opt/atat/atst/script/sync-crls tests/crl-tmp" >> /etc/crontabs/atst - # Add required system packages and app user RUN set -x ; \ script/alpine_setup