Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

test image CI #24

Merged
merged 3 commits into from
Sep 22, 2022
Merged

test image CI #24

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b694c84
test image CI
aGuttman Sep 21, 2022
6cdb81e
Remove conda install, file reorg
aGuttman Sep 22, 2022
a45db75
Change starting image
aGuttman Sep 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions examples/em-server-multi-tier-cronjob/analysis/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# 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
shankari marked this conversation as resolved.
Show resolved Hide resolved
shankari marked this conversation as resolved.
Show resolved Hide resolved

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"]
7 changes: 5 additions & 2 deletions examples/em-server-multi-tier-cronjob/analysis/start_cron.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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
6 changes: 3 additions & 3 deletions examples/em-server-multi-tier-cronjob/webapp/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# 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
shankari marked this conversation as resolved.
Show resolved Hide resolved

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"]
8 changes: 6 additions & 2 deletions examples/em-server-multi-tier-cronjob/webapp/start_script.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
#!/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"
sed -i -e "s|HASHED|ASCENDING|" emission/core/get_database.py
sed -i -e "/GEOSPHERE/d" emission/core/get_database.py
fi

source /start_script.sh
source ./.docker/docker_start_script.sh