From 81ba73e425ba7642fc4a4e4deb6396166c6c5843 Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Wed, 30 Mar 2022 17:24:31 +0200
Subject: [PATCH] set back JASS_DATA_DIR to /code/data, remove data_persistent

---
 .dockerignore                                 |  3 +-
 Dockerfile                                    |  5 +--
 chart/templates/deployment-back.yaml          |  2 +-
 chart/templates/deployment-celery-worker.yaml |  2 +-
 docker-compose.yaml                           |  6 ++--
 docker-entrypoint.sh                          | 34 +++++++++----------
 6 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index a21180bf..d3785139 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,4 +1,3 @@
-data/initTable.hdf5
-data/project_*
+data/
 client/
 .venv/
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 99312aa7..ed07cacf 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,6 @@
 FROM python:3.9 as backend
 
-ENV JASS_DATA_DIR '/code/data_persistent'
-ENV DATA_DIR_READY '/code/data_persistent/data_loaded.flag'
+ENV JASS_DATA_DIR '/code/data'
 
 EXPOSE 8080
 
@@ -29,8 +28,6 @@ COPY ./*-entrypoint.sh /
 RUN chmod a+x /*-entrypoint.sh
 ENTRYPOINT ["/docker-entrypoint.sh"]
 
-ENV INIT_TABLE_URL "http://dl.pasteur.fr/fop/N5oQpY5V/initTable_alltrait.hdf5"
-
 COPY . /code/
 RUN pip install -e .
 
diff --git a/chart/templates/deployment-back.yaml b/chart/templates/deployment-back.yaml
index 28c1f0fb..3a07fcef 100644
--- a/chart/templates/deployment-back.yaml
+++ b/chart/templates/deployment-back.yaml
@@ -36,7 +36,7 @@ spec:
         resources:
           {{- toYaml .Values.back.resources | nindent 12 }}
         volumeMounts:
-          - mountPath: /code/data_persistent
+          - mountPath: /code/data
             name: data-files
       volumes:
         - name: data-files
diff --git a/chart/templates/deployment-celery-worker.yaml b/chart/templates/deployment-celery-worker.yaml
index aefca8bd..cebf2772 100644
--- a/chart/templates/deployment-celery-worker.yaml
+++ b/chart/templates/deployment-celery-worker.yaml
@@ -47,7 +47,7 @@ spec:
         resources:
           {{- toYaml .Values.celery.resources | nindent 12 }}
         volumeMounts:
-          - mountPath: /code/data_persistent
+          - mountPath: /code/data
             name: data-files
       volumes:
         - name: data-files
diff --git a/docker-compose.yaml b/docker-compose.yaml
index d5914435..5a960b9e 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -19,8 +19,7 @@ services:
       JASS_RABBITMQ_URL: 'amqp://guest:guest@rabbitmq:5672'
       WAIT_FOR_DATA_DIR_READY: 1
     volumes:
-      - ./data:/code/data:ro
-      - ./data:/code/data_persistent
+      - ./data:/code/data
       - ./jass:/code/jass
     depends_on:
       - rabbitmq
@@ -32,8 +31,7 @@ services:
     environment:
       JASS_RABBITMQ_URL: 'amqp://guest:guest@rabbitmq:5672'
     volumes:
-      - ./data:/code/data:ro
-      - ./data:/code/data_persistent
+      - ./data:/code/data
       - ./jass:/code/jass
     ports:
       - '8080:8080'
diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 75bc0909..a0aa4ac3 100644
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -23,23 +23,23 @@ if [ "$1" == "hold_on" ]; then
     done
 fi
 
-if [ "${WAIT_FOR_DATA_DIR_READY}" == "1" ]; then
-    while [ ! -f ${DATA_DIR_READY} ]; do
-        msg_info "Waiting for data dir ot flagged ready with ${DATA_DIR_READY}"
-        sleep 5
-    done
-else
-    msg_info "Copying file from /code/data to ${JASS_DATA_DIR}"
-    rsync -a /code/data/ ${JASS_DATA_DIR}/
-    export INIT_TABLE_PATH="${JASS_DATA_DIR}/initTable.hdf5"
-    if [ ! -f ${INIT_TABLE_PATH} ]; then
-        msg_info "$INIT_TABLE_PATH missing, downloading it from $INIT_TABLE_URL"
-        wget "${INIT_TABLE_URL}" --output-document=${INIT_TABLE_PATH}
-    else
-        msg_info "$INIT_TABLE_PATH found"
-    fi
-    touch ${DATA_DIR_READY}
-fi
+#if [ "${WAIT_FOR_DATA_DIR_READY}" == "1" ]; then
+#    while [ ! -f ${DATA_DIR_READY} ]; do
+#        msg_info "Waiting for data dir ot flagged ready with ${DATA_DIR_READY}"
+#        sleep 5
+#    done
+#else
+#    msg_info "Copying file from /code/data to ${JASS_DATA_DIR}"
+#    rsync -a /code/data/ ${JASS_DATA_DIR}/
+#    export INIT_TABLE_PATH="${JASS_DATA_DIR}/initTable.hdf5"
+#    if [ ! -f ${INIT_TABLE_PATH} ]; then
+#        msg_info "$INIT_TABLE_PATH missing, downloading it from $INIT_TABLE_URL"
+#        wget "${INIT_TABLE_URL}" --output-document=${INIT_TABLE_PATH}
+#    else
+#        msg_info "$INIT_TABLE_PATH found"
+#    fi
+#    touch ${DATA_DIR_READY}
+#fi
 
 
 exec "$@"
-- 
GitLab