diff --git a/setup/dockers/cheatsheet.md b/setup/dockers/cheatsheet.md index 78bd05c29da0e8a2f0d0f21cbba795ef981eebbc..86dfd92d04fae166867e3174b151875a000f8e4d 100644 --- a/setup/dockers/cheatsheet.md +++ b/setup/dockers/cheatsheet.md @@ -1,6 +1,6 @@ ** Docker commands for advanced testing ** ``` # check ports redirection -docker inspect comex_flask_test | jq '.[0].NetworkSettings' -docker exec -it comex_flask_test bash +docker inspect comex_test | jq '.[0].NetworkSettings' +docker exec -it comex_test bash ``` diff --git a/setup/dockers/docker-compose.yml b/setup/dockers/docker-compose.yml index 46a05a87e66e2518c69aa6381cd90acec4ecd55a..c9a946cf95d5bfcd8d63b0f67728f09b4658746b 100644 --- a/setup/dockers/docker-compose.yml +++ b/setup/dockers/docker-compose.yml @@ -17,7 +17,7 @@ - "32789:8989" # POSSIBLE volume for h2 DB itself - flask_ispcif_regcomex: + comex_test: image: flask_iscpif_regcomex depends_on: - mysql_regcomex diff --git a/setup/dockers/flask_iscpif_regcomex/Dockerfile b/setup/dockers/flask_iscpif_regcomex/Dockerfile index 879068287579b9ecc3c231a5ab85c5477e7f7c74..888746872b2e8c633da2f6170b3b8e4a188d7520 100644 --- a/setup/dockers/flask_iscpif_regcomex/Dockerfile +++ b/setup/dockers/flask_iscpif_regcomex/Dockerfile @@ -13,21 +13,30 @@ ENV DEBIAN_FRONTEND noninteractive RUN locale-gen fr_FR fr_FR.UTF-8 RUN dpkg-reconfigure locales -RUN apt-get update && apt-get autoclean -RUN apt-get install -y python3-pip git nano - -# Install global dependencies +# Install global dependencies and utilities +RUN apt update && apt autoclean +RUN apt install -y python3-pip libmysqlclient-dev git nano tree htop RUN pip3 install --upgrade pip -RUN pip3 install gunicorn flask # for regcomex itself ---------------------------------------------------------- # pull the comex server from repository RUN git clone https://github.com/moma/regcomex.git +# Install project dependencies +RUN pip3 install -r regcomex/setup/requirements.txt + # main CMD to start the app WORKDIR /regcomex + +# flask dev server +# CMD python3 server_comex_registration.py + +# gunicorn production server CMD bash run.sh -# Ports -EXPOSE 5000 +# ports ------------------------------------------------------------------------ +# flask dev server +# EXPOSE 5000 + +# gunicorn production server EXPOSE 9090 diff --git a/setup/dockers/minidoors/Dockerfile b/setup/dockers/minidoors/Dockerfile index 8798e73282ed929b12f0829614884f28bc499a59..71373d6e425a89d469ea7e62ebff6df656dc5a55 100644 --- a/setup/dockers/minidoors/Dockerfile +++ b/setup/dockers/minidoors/Dockerfile @@ -37,7 +37,7 @@ WORKDIR /root/doors/application # build and compile it once so it downloads dependencies RUN sbt "project lab" compile test package -# sset docker run command to run doors servers +# set docker run command to run doors servers CMD sbt "project lab" run # ports