Merge remote-tracking branch 'origin/20-add-start-devsh-to-start-with…

…-exposed-postgres-and-image-from-local-code' into 22-synchronize-endpoints-wrt-esdl-encoding

dev.Dockerfile

@@ -2,7 +2,7 @@ FROM python:3.10-slim
 
 WORKDIR /app
 
-ENV ENV=prod
+ENV ENV=dev
 ENV FLASK_APP=omotes_rest/main.py
 
 RUN apt-get -y update
@@ -13,8 +13,8 @@ RUN pip install --no-cache-dir -r /app/omotes_rest/requirements.txt
 
 COPY ../omotes-sdk-protocol/python/ /omotes-sdk-protocol/python/
 COPY ../omotes-sdk-python/ /omotes-sdk-python/
-RUN pip install -e /omotes-sdk-python/
-RUN pip install -e /omotes-sdk-protocol/python/
+RUN pip install /omotes-sdk-python/
+RUN pip install /omotes-sdk-protocol/python/
 
 COPY omotes-rest/src /app
 # To avoid warning from flask dotenv.

docker-compose.override.dev.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 services:
   omotes-rest:
       image: omotes-rest-dev

docker-compose.yml

@@ -1,5 +1,3 @@
-version: "3.8"
-
 networks:
   omotes:
     external: true

postgres_db_upgrade/scripts/start_postgres_in_setup_mode.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
 docker compose -f ../docker-compose.dev.yml down rest_postgres_db
-docker compose -f ../docker-compose.dev.yml up --wait rest_postgres_db_dev
+docker compose -f ../docker-compose.yml -f ../docker-compose.override.dev.yml up --wait rest_postgres_db

scripts/setup.sh

@@ -6,7 +6,7 @@
 #$DOCKER_COMPOSE stop
 
 # Deploy postgres omotes_rest schema
-$DOCKER_COMPOSE -f ./docker-compose.yml --profile=manual_dev down rest_postgres_db_dev
+$DOCKER_COMPOSE -f ./docker-compose.yml down rest_postgres_db
 $DOCKER_COMPOSE -f ./docker-compose.yml up -d --wait rest_postgres_db
 $DOCKER_COMPOSE -f ./docker-compose.yml exec rest_postgres_db psql -d postgres -c 'CREATE DATABASE omotes_rest;'
 $DOCKER_COMPOSE -f ./docker-compose.yml exec rest_postgres_db psql -d omotes_rest -c "CREATE USER ${POSTGRES_USERNAME} WITH PASSWORD '${POSTGRES_PASSWORD}';"

scripts/start-dev.sh

@@ -2,6 +2,5 @@
 
 . scripts/_select_docker_compose.sh
 
-$DOCKER_COMPOSE -f ./docker-compose.dev.yml -f ./docker-compose.override.dev.yml --profile=manual_dev --profile=manual_setup down
-$DOCKER_COMPOSE -f ./docker-compose.yml -f ./docker-compose.override.dev.yml down
+$DOCKER_COMPOSE -f ./docker-compose.yml --profile=manual_setup down
 $DOCKER_COMPOSE -f ./docker-compose.yml -f ./docker-compose.override.dev.yml up --wait --build

scripts/start.sh

@@ -2,6 +2,5 @@
 
 . scripts/_select_docker_compose.sh
 
-$DOCKER_COMPOSE -f ./docker-compose.dev.yml --profile=manual_dev --profile=manual_setup down
-$DOCKER_COMPOSE -f ./docker-compose.yml down
+$DOCKER_COMPOSE -f ./docker-compose.yml --profile=manual_setup down
 $DOCKER_COMPOSE -f ./docker-compose.yml up --wait

scripts/stop.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 . scripts/_select_docker_compose.sh
 
-$DOCKER_COMPOSE down
+$DOCKER_COMPOSE -f ./docker-compose.yml --profile=manual_setup down