From 3cb9203d7d7a5eb620559488024e971447c19148 Mon Sep 17 00:00:00 2001
From: Dustin Lang <dstn@cloud2b.arbutus>
Date: Tue, 12 Dec 2023 02:28:36 +0000
Subject: [PATCH] update docker webservice

---
 docker/README.md                        |  9 ++++++++-
 docker/webservice/Dockerfile            |  8 ++++----
 docker/webservice/run.sh                |  2 +-
 docker/webservice/solvescript-docker.sh | 16 ++++++++++++++++
 4 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100755 docker/webservice/solvescript-docker.sh

diff --git a/docker/README.md b/docker/README.md
index 9abd02596..028370aaf 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -5,5 +5,12 @@ Docker containers for Astrometry.net
 
 (cd webservice && docker build -t astrometrynet/webservice:latest .)
 
-docker run --net=host astrometrynet/webservice
+Web service: create a directory with index files in it, eg /tmp/index,
+including a docker.cfg astrometry.net configuration file, eg
+  add_path /index
+  autoindex
+  inparallel
+and then mount it into the contain via
+
+docker run --net=host --volume /tmp/index:/index astrometrynet/webservice
 
diff --git a/docker/webservice/Dockerfile b/docker/webservice/Dockerfile
index 1e7a867d3..09fc06bd9 100644
--- a/docker/webservice/Dockerfile
+++ b/docker/webservice/Dockerfile
@@ -27,8 +27,7 @@ RUN mkdir appsecrets && \
     cp appsecrets-example/django.py appsecrets
 COPY django_db.py /src/astrometry/net/appsecrets/
 #RUN (echo -n "DJANGO_SECRET_KEY = '"; tr -dc A-Za-z0-9 </dev/urandom | head -c 52; echo "'") > /src/astrometry/net/appsecrets/django.py
-
-RUN git stash && git pull
+#RUN git stash && git pull
 
 RUN mv migrations/* /tmp && \
     python manage.py makemigrations && \
@@ -41,8 +40,9 @@ RUN mv migrations/* /tmp && \
 RUN git pull
 ENV WSGI_LOG_FILE=
 COPY run.sh /src/astrometry/net/
-
-CMD run.sh
+COPY solvescript-docker.sh /src/astrometry/net
+RUN mkdir /index
+CMD ./run.sh
 
 #CMD python manage.py runserver 0.0.0.0:8000
 
diff --git a/docker/webservice/run.sh b/docker/webservice/run.sh
index cc4110cfc..639898dcb 100755
--- a/docker/webservice/run.sh
+++ b/docker/webservice/run.sh
@@ -2,6 +2,6 @@
 
 python manage.py runserver 0.0.0.0:8000 &
 
-python process_submissions.py &
+python -u process_submissions.py --solve-locally=/src/astrometry/net/solvescript-docker.sh &
 
 wait
diff --git a/docker/webservice/solvescript-docker.sh b/docker/webservice/solvescript-docker.sh
new file mode 100755
index 000000000..4f866644f
--- /dev/null
+++ b/docker/webservice/solvescript-docker.sh
@@ -0,0 +1,16 @@
+#! /bin/bash
+
+# Run via:
+#   python process_submissions.py --solve-locally=$(pwd)/solvescript.sh
+
+set -e
+
+jobid=$1
+axyfile=$2
+
+BACKEND="/usr/local/bin/astrometry-engine"
+CFG="/index/docker.cfg"
+export TMP=/tmp
+
+$BACKEND -v -c $CFG $axyfile -j $jobid
+