Commit 2da110b4ef0c497b46f14695b381108eea9afbd6
1 parent
2be8242a
Exists in
dev
fix call to START.bat => START.sh in all PYROS_DOCKER_ scripts
Showing
6 changed files
with
10 additions
and
41 deletions
Show diff stats
Dockerfile-django2 deleted
... | ... | @@ -1,36 +0,0 @@ |
1 | -FROM python:3.8 | |
2 | - | |
3 | -RUN apt-get update && apt-get install -y \ | |
4 | - default-mysql-client \ | |
5 | - git \ | |
6 | - nano \ | |
7 | - vim | |
8 | - | |
9 | -# Get IRAP self signed certificate | |
10 | -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 | |
11 | - | |
12 | - | |
13 | -# adding new user (pyros_user) and creating his home folder | |
14 | -RUN useradd --create-home --shell /bin/bash pyros_user | |
15 | - | |
16 | -# Create the work dir and set permissions as pyros_user | |
17 | -RUN mkdir -p /home/pyros_user/app/ && chown -R pyros_user:pyros_user /home/pyros_user/app | |
18 | -WORKDIR /home/pyros_user/app | |
19 | - | |
20 | -# switch from root to pyros_user | |
21 | -USER pyros_user | |
22 | - | |
23 | -RUN pip install --user --upgrade pip | |
24 | -RUN pip install --user wheel | |
25 | -RUN pip install --user numpy | |
26 | -# copy local host machine files to image | |
27 | -COPY --chown=pyros_user:pyros_user . . | |
28 | - | |
29 | -# adding local/bin to path to avoid pip warning | |
30 | -ENV PATH "$PATH:/home/pyros_user/.local/bin" | |
31 | - | |
32 | -# installing click on the image to prevent error on the first execution of the installation script | |
33 | -RUN pip install --user click | |
34 | - | |
35 | -# installing packages required for PyROS | |
36 | -RUN pip install --user -r ./install/requirements_django2.txt | |
37 | 0 | \ No newline at end of file |
docker/PYROS_DOCKER_INSTALL
... | ... | @@ -3,7 +3,8 @@ |
3 | 3 | # if no container is running |
4 | 4 | if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] ; then |
5 | 5 | echo "pyros-db or pyros weren't running, starting them..." |
6 | - ./PYROS_DOCKER_START.bat | |
6 | + ./PYROS_DOCKER_START.sh | |
7 | + #./PYROS_DOCKER_START.bat | |
7 | 8 | fi |
8 | 9 | |
9 | 10 | # while db container isn't ready to execute queries, wait 5 seconds | ... | ... |
docker/PYROS_DOCKER_RUN
docker/PYROS_DOCKER_SHELL
docker/PYROS_DOCKER_TEST
... | ... | @@ -4,7 +4,8 @@ |
4 | 4 | if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ] |
5 | 5 | then |
6 | 6 | echo "pyros-db or pyros weren't running, starting them..." |
7 | - ./PYROS_DOCKER_START.bat | |
7 | + ./PYROS_DOCKER_START.sh | |
8 | + #./PYROS_DOCKER_START.bat | |
8 | 9 | fi |
9 | 10 | docker compose exec pyros python3 pyros.py test $@ |
10 | 11 | ... | ... |
docker/PYROS_DOCKER_UPDATE