fix call to START.bat => START.sh in all PYROS_DOCKER_ scripts

Etienne Pallier
1 parent 2be8242a
Showing 6 changed files with 10 additions and 41 deletions Show diff stats
Dockerfile-django2
docker/PYROS_DOCKER_INSTALL
docker/PYROS_DOCKER_RUN
docker/PYROS_DOCKER_SHELL
docker/PYROS_DOCKER_TEST
docker/PYROS_DOCKER_UPDATE
@@ -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
@@ -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
@@ -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 :"
@@ -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 $@
@@ -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 $@
@@ -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