diff --git a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile index e53f0bf..d782985 100644 --- a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile @@ -1,12 +1,12 @@ # python 3 -FROM emission/e-mission-server.dev.server-only:4.0.0 +FROM shankari/e-mission-server:master_2022-09-22--20-37 COPY conf /conf # CHANGEME: Default crontab runs the regular intake pipeline every hour at 5 # mins past the hour. Also includes some additional commented out scripts. # Replace by your own if you need any other periodic invocations -COPY crontab /usr/src/app/crontab -COPY start_cron.sh /usr/src/app/start_cron.sh +COPY crontab /usr/src/app/.docker/crontab +COPY start_cron.sh /usr/src/app/.docker/start_cron.sh -CMD ["/bin/bash", "/usr/src/app/start_cron.sh"] +CMD ["/bin/bash", "/usr/src/app/.docker/start_cron.sh"] diff --git a/examples/em-server-multi-tier-cronjob/analysis/start_cron.sh b/examples/em-server-multi-tier-cronjob/analysis/start_cron.sh index 2437327..54903e1 100755 --- a/examples/em-server-multi-tier-cronjob/analysis/start_cron.sh +++ b/examples/em-server-multi-tier-cronjob/analysis/start_cron.sh @@ -1,4 +1,7 @@ -source /clone_server.sh +if [ -d "/conf" ]; then + echo "Found configuration, overriding..." + cp -r /conf/* conf/ +fi if [[ -v SIMPLE_INDICES ]]; then echo "Replacing database indices for compatibility with DocumentDB" @@ -29,4 +32,4 @@ pip install devcron # launch the cronjob echo "Launch the cronjob" # while true; do sleep 30; done; -devcron ../crontab >> /var/log/cron.console.stdinout 2>&1 +devcron ./.docker/crontab >> /var/log/cron.console.stdinout 2>&1 \ No newline at end of file diff --git a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile index e611945..aafbd50 100644 --- a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile @@ -1,7 +1,7 @@ # python 3 -FROM emission/e-mission-server.dev.server-only:4.0.0 +FROM shankari/e-mission-server:master_2022-09-22--20-37 COPY conf /conf -COPY start_script.sh /usr/src/app/start_script.sh -CMD ["/bin/bash", "/usr/src/app/start_script.sh"] +COPY start_script.sh /usr/src/app/.docker/start_script.sh +CMD ["/bin/bash", "/usr/src/app/.docker/start_script.sh"] diff --git a/examples/em-server-multi-tier-cronjob/webapp/start_script.sh b/examples/em-server-multi-tier-cronjob/webapp/start_script.sh index a03ffd4..ae7048e 100755 --- a/examples/em-server-multi-tier-cronjob/webapp/start_script.sh +++ b/examples/em-server-multi-tier-cronjob/webapp/start_script.sh @@ -1,5 +1,9 @@ #!/usr/bin/env bash -source /clone_server.sh + +if [ -d "/conf" ]; then + echo "Found configuration, overriding..." + cp -r /conf/* conf/ +fi if [[ -v SIMPLE_INDICES ]]; then echo "Replacing database indices for compatibility with DocumentDB" @@ -7,4 +11,4 @@ if [[ -v SIMPLE_INDICES ]]; then sed -i -e "/GEOSPHERE/d" emission/core/get_database.py fi -source /start_script.sh +source ./.docker/docker_start_script.sh