From b694c84ce00af4ab73909c5a100ce330f9fbdee8 Mon Sep 17 00:00:00 2001 From: aGuttman Date: Wed, 21 Sep 2022 10:10:32 -0600 Subject: [PATCH 1/3] test image CI Changes made within examples/em-server-multi-tier-cronjob to use and run server images created by new CI in e-mission-server. CHANGEME left in docker-compose.yml for port number so that user/tester can think about what they need for their purposes themselves. --- examples/em-server-multi-tier-cronjob/analysis/Dockerfile | 2 +- examples/em-server-multi-tier-cronjob/analysis/start_cron.sh | 4 ++-- examples/em-server-multi-tier-cronjob/webapp/Dockerfile | 2 +- examples/em-server-multi-tier-cronjob/webapp/start_script.sh | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile index e53f0bf..29ce596 100644 --- a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile @@ -1,5 +1,5 @@ # python 3 -FROM emission/e-mission-server.dev.server-only:4.0.0 +FROM agutt/e-mission-server:ceo_ebike_project_2022-09-19--45-23 COPY conf /conf 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..9f18c5d 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,4 @@ -source /clone_server.sh +source ./.docker/setup_config.sh if [[ -v SIMPLE_INDICES ]]; then echo "Replacing database indices for compatibility with DocumentDB" @@ -29,4 +29,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 ./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..a06d0eb 100644 --- a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile @@ -1,5 +1,5 @@ # python 3 -FROM emission/e-mission-server.dev.server-only:4.0.0 +FROM agutt/e-mission-server:ceo_ebike_project_2022-09-19--45-23 COPY conf /conf 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..0f65833 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,6 @@ #!/usr/bin/env bash -source /clone_server.sh + +source ./.docker/setup_config.sh if [[ -v SIMPLE_INDICES ]]; then echo "Replacing database indices for compatibility with DocumentDB" @@ -7,4 +8,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 From 6cdb81eb77519d9a580d28a6b2555482417e12e1 Mon Sep 17 00:00:00 2001 From: aGuttman Date: Thu, 22 Sep 2022 14:00:30 -0600 Subject: [PATCH 2/3] Remove conda install, file reorg Removed the use of a script that reinstalled conda while saving the config copying. Moved where supplemental scripts get copied into. --- examples/em-server-multi-tier-cronjob/analysis/Dockerfile | 6 +++--- .../em-server-multi-tier-cronjob/analysis/start_cron.sh | 7 +++++-- examples/em-server-multi-tier-cronjob/webapp/Dockerfile | 4 ++-- .../em-server-multi-tier-cronjob/webapp/start_script.sh | 5 ++++- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile index 29ce596..e905cbb 100644 --- a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile @@ -6,7 +6,7 @@ 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 9f18c5d..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 ./.docker/setup_config.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 \ No newline at end of file +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 a06d0eb..38dd6fe 100644 --- a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile @@ -3,5 +3,5 @@ FROM agutt/e-mission-server:ceo_ebike_project_2022-09-19--45-23 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 0f65833..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,6 +1,9 @@ #!/usr/bin/env bash -source ./.docker/setup_config.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" From a45db75c2fb3decc24c34e0a04363db75cfa06df Mon Sep 17 00:00:00 2001 From: aGuttman Date: Thu, 22 Sep 2022 15:12:38 -0600 Subject: [PATCH 3/3] Change starting image Change starting image from one hosted by Andrew to Shankari. Tested and works. --- examples/em-server-multi-tier-cronjob/analysis/Dockerfile | 2 +- examples/em-server-multi-tier-cronjob/webapp/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile index e905cbb..d782985 100644 --- a/examples/em-server-multi-tier-cronjob/analysis/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/analysis/Dockerfile @@ -1,5 +1,5 @@ # python 3 -FROM agutt/e-mission-server:ceo_ebike_project_2022-09-19--45-23 +FROM shankari/e-mission-server:master_2022-09-22--20-37 COPY conf /conf diff --git a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile index 38dd6fe..aafbd50 100644 --- a/examples/em-server-multi-tier-cronjob/webapp/Dockerfile +++ b/examples/em-server-multi-tier-cronjob/webapp/Dockerfile @@ -1,5 +1,5 @@ # python 3 -FROM agutt/e-mission-server:ceo_ebike_project_2022-09-19--45-23 +FROM shankari/e-mission-server:master_2022-09-22--20-37 COPY conf /conf