diff --git a/1.gitclone.sh b/1.gitclone.sh index fd7768e..0cd8337 100755 --- a/1.gitclone.sh +++ b/1.gitclone.sh @@ -2,12 +2,10 @@ set -euo pipefail source ./0.variables.env -mkdir -p odoo-filestore odoo-logs odoo-postgresql custom +mkdir -p odoo-filestore odoo-logs odoo-postgresql custom config-postgresql config-odoo # Downlaod des repo OCA - -cd custom for repo in \ https://github.com/OCA/server-brand.git \ https://github.com/oca/web.git \ @@ -37,15 +35,16 @@ for repo in \ https://github.com/OCA/server-ux.git \ https://github.com/OCA/social.git do - git clone -b 18.0 "$repo" + name=$(basename "$repo" .git) + git clone -b 18.0 "$repo" "custom/$name" + #git clone -b 18.0 "$repo" done -cd .. + # Recupération du Dockerfile d'odoo 18 - ODOO_DEST_DIR="./config-odoo/" FILES=(Dockerfile entrypoint.sh odoo.conf wait-for-psql.py) @@ -58,6 +57,10 @@ chmod +x "${ODOO_DEST_DIR}/entrypoint.sh" "${ODOO_DEST_DIR}/wait-for-psql.py" sed -i 's/curl \\/curl vim \\/' "${ODOO_DEST_DIR}/Dockerfile" sed -i 's|^COPY \./entrypoint\.sh /$|COPY ./requirements.txt /tmp/requirements.txt\nRUN pip install --no-cache-dir --break-system-packages -r /tmp/requirements.txt\nCOPY ./entrypoint.sh /|' "${ODOO_DEST_DIR}/Dockerfile" + + + + # Création du Dockerfile de Postgresql POSTGRESQL_DIR=./config-postgresql mkdir -p "$POSTGRESQL_DIR" @@ -76,7 +79,6 @@ EOF # update d'odoo.conf et de dockercompose.yam - sed -i -E "s/^([[:space:]]*)db_port[[:space:]]*=.*/\1db_port = $POSTGRESQL_PORT/" ./odoo.conf sed -i "s/postgres15-5434/postgres15-$POSTGRESQL_PORT/g" ./docker-compose.yml sed -i "s/postgres-XXXXXXXXXXXXXXXXXXXXXX/$POSTGRES_CONTAINER/g" ./docker-compose.yml