diff --git a/docker-compose-mktg.yml b/docker-compose-mktg.yml index 1c8c7d5cb5..added7ded6 100755 --- a/docker-compose-mktg.yml +++ b/docker-compose-mktg.yml @@ -13,7 +13,7 @@ version: '3.3' services: mktg: - image: eu.gcr.io/openedx-231314/edraak/marketing:20250618-153829-m + image: eu.gcr.io/openedx-231314/edraak/marketing:20251001-113835-m environment: NODE_ENV: development command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8500 --settings=marketingsite.envs.dev; sleep 2; done' diff --git a/docker-compose-progs.yml b/docker-compose-progs.yml index ef737ac043..4b13b39e65 100755 --- a/docker-compose-progs.yml +++ b/docker-compose-progs.yml @@ -13,11 +13,11 @@ version: '3.3' services: progs: - image: eu.gcr.io/openedx-231314/edraak/progs:20250618-155233-m + image: eu.gcr.io/openedx-231314/edraak/progs:20251001-113817-m environment: PROGS_CFG: /app/docker.json NODE_ENV: development - command: bash -c 'while true; do python3.8 manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done' + command: bash -c 'while true; do python manage.py runserver 0.0.0.0:8800 --settings=edraakprograms.dev; sleep 2; done' container_name: edraak.devstack.programs working_dir: /app ports: diff --git a/provision-mktg.sh b/provision-mktg.sh index fdf4d638cf..d6e679523d 100755 --- a/provision-mktg.sh +++ b/provision-mktg.sh @@ -8,10 +8,11 @@ echo "CREATE DATABASE IF NOT EXISTS marketingsite;" | docker exec -i edx.devstac echo "** Marketing: Copy cacheed files to code dir **" docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'cp -Rn /cache/* /app/.' -docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip3 install -r requirements.txt' +echo "** Marketing: Install requirements **" +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'pip install -r requirements.txt' echo "** Marketing: Migrating databases **" -docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python3.8 manage.py migrate --settings=marketingsite.envs.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'python manage.py migrate --settings=marketingsite.envs.dev' echo "** Marketing: Compiling assets **" docker compose `echo ${DOCKER_COMPOSE_FILES}` exec mktg bash -c 'rm -rf node_modules/' diff --git a/provision-progs.sh b/provision-progs.sh index e9cd061c64..04a529432d 100755 --- a/provision-progs.sh +++ b/provision-progs.sh @@ -8,14 +8,14 @@ echo "CREATE DATABASE IF NOT EXISTS edraakprograms;" | docker exec -i edx.devsta echo "** Progs: Setting correct python version **" -docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.8 1' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'update-alternatives --install /usr/bin/python python /usr/bin/python3.11 1' echo "** Progs: Copy cacheed files to code dir **" #docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'cp -Rn /cache/* /app/.' -docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip3 install -r requirements.txt' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'pip install -r requirements.txt' echo "** Progs: Migrating databases **" -docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python3.8 manage.py migrate --settings=edraakprograms.dev' +docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'python manage.py migrate --settings=edraakprograms.dev' echo "** Progs: Compiling assets **" docker compose `echo ${DOCKER_COMPOSE_FILES}` exec progs bash -c 'npm rebuild node-sass'