updating jenkins workflow so it's submodule compatible

CSSS · Oct 27, 2024 · 31e70b7 · 31e70b7
1 parent 585b272
commit 31e70b7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.wall_e_models b/.wall_e_models
diff --git a/CI/validate_and_deploy/2_deploy/server_scripts/Dockerfile.wall_e b/CI/validate_and_deploy/2_deploy/server_scripts/Dockerfile.wall_e
@@ -4,6 +4,8 @@ FROM $ORIGIN_IMAGE
 
 COPY wall_e ./
 
+COPY .wall_e_models/wall_e_models wall_e_models
+
 COPY CI/validate_and_deploy/2_deploy/create-database.ddl .
 
 COPY CI/validate_and_deploy/2_deploy/server_scripts/wait-for-postgres.sh .

diff --git a/CI/validate_and_deploy/2_deploy/server_scripts/Dockerfile.wall_e_base b/CI/validate_and_deploy/2_deploy/server_scripts/Dockerfile.wall_e_base
@@ -10,4 +10,8 @@ WORKDIR $CONTAINER_HOME_DIR
 
 COPY wall_e/requirements.txt .
 
-RUN pip install --no-cache-dir -r requirements.txt
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY .wall_e_models/requirements.txt wall_e_models_requirements.txt
+
+RUN pip install --no-cache-dir -r wall_e_models_requirements.txt
diff --git a/CI/validate_and_deploy/2_deploy/server_scripts/deploy_to_prod_discord_guild.sh b/CI/validate_and_deploy/2_deploy/server_scripts/deploy_to_prod_discord_guild.sh
@@ -39,6 +39,7 @@ docker rm -f ${prod_container_name} || true
 docker image rm -f ${prod_image_name_lower_case} || true
 docker volume create --name="${COMPOSE_PROJECT_NAME}_logs"
 
+git submodule update --init --recursive
 
 re_create_top_base_image () {
     docker image rm -f "${prod_image_name_lower_case}" "${wall_e_top_base_image}" "${ORIGIN_IMAGE}"
+10 −3		wall_e_models/customFields.py
+0 −18		wall_e_models/migrations/0025_alter_banrecord_ban_id.py
+2 −2		wall_e_models/models.py