From 2da110b4ef0c497b46f14695b381108eea9afbd6 Mon Sep 17 00:00:00 2001
From: Etienne Pallier <epallier@irap.omp.eu>
Date: Fri, 6 Oct 2023 09:11:07 +0200
Subject: [PATCH] fix call to START.bat => START.sh in all PYROS_DOCKER_ scripts

---
 Dockerfile-django2          | 36 ------------------------------------
 docker/PYROS_DOCKER_INSTALL |  3 ++-
 docker/PYROS_DOCKER_RUN     |  3 ++-
 docker/PYROS_DOCKER_SHELL   |  3 ++-
 docker/PYROS_DOCKER_TEST    |  3 ++-
 docker/PYROS_DOCKER_UPDATE  |  3 ++-
 6 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 Dockerfile-django2

diff --git a/Dockerfile-django2 b/Dockerfile-django2
deleted file mode 100644
index bea110a..0000000
--- a/Dockerfile-django2
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM python:3.8
-
-RUN apt-get update && apt-get install -y \
-    default-mysql-client \
-    git \
-    nano \
-    vim
-
-# Get IRAP self signed certificate
-RUN echo | openssl s_client -connect gitlab.irap.omp.eu:443 -servername gitlab.irap.omp.eu 2>/dev/null | openssl x509 > /etc/ssl/certs/gitlab.irap.omp.eu.crt
-
-
-# adding new user (pyros_user) and creating his home folder
-RUN useradd --create-home --shell /bin/bash pyros_user
-
-# Create the work dir and set permissions as pyros_user 
-RUN mkdir -p /home/pyros_user/app/ && chown -R pyros_user:pyros_user /home/pyros_user/app
-WORKDIR /home/pyros_user/app
-
-# switch from root to pyros_user
-USER pyros_user
-
-RUN pip install --user --upgrade pip
-RUN pip install --user wheel
-RUN pip install --user numpy
-# copy local host machine files to image
-COPY --chown=pyros_user:pyros_user . .
-
-# adding local/bin to path to avoid pip warning
-ENV PATH "$PATH:/home/pyros_user/.local/bin"
-
-# installing click on the image to prevent error on the first execution of the installation script
-RUN pip install --user click
-
-# installing packages required for PyROS
-RUN pip install --user -r ./install/requirements_django2.txt
\ No newline at end of file
diff --git a/docker/PYROS_DOCKER_INSTALL b/docker/PYROS_DOCKER_INSTALL
index e76ce47..9935b18 100755
--- a/docker/PYROS_DOCKER_INSTALL
+++ b/docker/PYROS_DOCKER_INSTALL
@@ -3,7 +3,8 @@
 # if no container is running
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then
     echo "pyros-db or pyros weren't running, starting them..."
-    ./PYROS_DOCKER_START.bat
+    ./PYROS_DOCKER_START.sh
+    #./PYROS_DOCKER_START.bat
 fi
 
 # while db container isn't ready to execute queries, wait 5 seconds
diff --git a/docker/PYROS_DOCKER_RUN b/docker/PYROS_DOCKER_RUN
index 29b8328..893014d 100755
--- a/docker/PYROS_DOCKER_RUN
+++ b/docker/PYROS_DOCKER_RUN
@@ -4,7 +4,8 @@
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
 then
     echo "pyros-db or pyros weren't running, starting them..."
-    ./PYROS_DOCKER_START.bat
+    ./PYROS_DOCKER_START.sh
+    #./PYROS_DOCKER_START.bat
 fi
 
 echo "LOG files :"
diff --git a/docker/PYROS_DOCKER_SHELL b/docker/PYROS_DOCKER_SHELL
index 51e2258..71d5e81 100755
--- a/docker/PYROS_DOCKER_SHELL
+++ b/docker/PYROS_DOCKER_SHELL
@@ -4,7 +4,8 @@
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
 then
     echo "pyros-db or pyros weren't running, starting them..."
-    ./PYROS_DOCKER_START.bat
+    ./PYROS_DOCKER_START.sh
+    #./PYROS_DOCKER_START.bat
 fi
 docker compose exec pyros bash $@
 
diff --git a/docker/PYROS_DOCKER_TEST b/docker/PYROS_DOCKER_TEST
index ee4d774..b997496 100755
--- a/docker/PYROS_DOCKER_TEST
+++ b/docker/PYROS_DOCKER_TEST
@@ -4,7 +4,8 @@
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
 then
     echo "pyros-db or pyros weren't running, starting them..."
-    ./PYROS_DOCKER_START.bat
+    ./PYROS_DOCKER_START.sh
+    #./PYROS_DOCKER_START.bat
 fi
 docker compose exec pyros python3 pyros.py test $@
 
diff --git a/docker/PYROS_DOCKER_UPDATE b/docker/PYROS_DOCKER_UPDATE
index 27daf44..a12b1f3 100755
--- a/docker/PYROS_DOCKER_UPDATE
+++ b/docker/PYROS_DOCKER_UPDATE
@@ -4,7 +4,8 @@
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
 then
     echo "pyros-db or pyros weren't running, starting them..."
-    ./PYROS_DOCKER_START.bat
+    ./PYROS_DOCKER_START.sh
+    #./PYROS_DOCKER_START.bat
 fi
 
 # 1) Update Guitastro
--
libgit2 0.21.2