Sanitize branch names for docker compose commands

data-handling-ng.yml

@@ -66,7 +66,8 @@ CollectDatabase:
     - branch=${CHAT_INPUT}${TRIGGER_INPUT}
     - if [[ ! -d /data/${branch} ]]; then echo "Branch $branch does not exist"; exit 1; fi
     - cd /data/${branch}/app
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush sql:dump --result-file=/var/backups/mysql/drupal.sql
+    - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g')
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush sql:dump --result-file=/var/backups/mysql/drupal.sql
     - cd -
     - cp /data/${branch}/files/db/drupal.sql .
   artifacts:
@@ -117,13 +118,15 @@ CopyDataToStage:
     - if [[ ! -d /data/${targetbranch}/app ]]; then echo "Target branch does not exist!"; exit 2; fi
     - if [[ "${targetbranch}" == "main" ]]; then echo "Main branch is not an allowed target!"; exit 3; fi
     - cd /data/${sourcebranch}/app
-    - docker compose --project-name ${CI_PROJECT_NAME}_${sourcebranch} exec php drush sql:dump --result-file=/var/backups/mysql/drupal.sql
+    - SANITIZED_SOURCE_BRANCH_NAME=$(echo ${sourcebranch} | sed -r 's/[/_]+/-/g')
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_SOURCE_BRANCH_NAME} exec php drush sql:dump --result-file=/var/backups/mysql/drupal.sql
     - rsync -rlDzogtp /data/${sourcebranch}/files/ /data/${targetbranch}/files/
     - cd /data/${targetbranch}/app
-    - docker compose --project-name ${CI_PROJECT_NAME}_${targetbranch} cp /data/${targetbranch}/files/db/drupal.sql php:/tmp
-    - docker compose --project-name ${CI_PROJECT_NAME}_${targetbranch} exec php drush -y sql:drop
-    - docker compose --project-name ${CI_PROJECT_NAME}_${targetbranch} exec php drush -y sql:query --file=/tmp/drupal.sql
-    - docker compose --project-name ${CI_PROJECT_NAME}_${targetbranch} exec php drush cr
+    - SANITIZED_TARGET_BRANCH_NAME=$(echo ${targetbranch} | sed -r 's/[/_]+/-/g')
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_TARGET_BRANCH_NAME} cp /data/${targetbranch}/files/db/drupal.sql php:/tmp
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_TARGET_BRANCH_NAME} exec php drush -y sql:drop
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_TARGET_BRANCH_NAME} exec php drush -y sql:query --file=/tmp/drupal.sql
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_TARGET_BRANCH_NAME} exec php drush cr
 
 ResetLocales:
   variables:
@@ -143,14 +146,15 @@ ResetLocales:
     - echo "Branch ${branch}"
     - if [[ ! -d /data/${branch}/app ]]; then branch=main; fi
     - cd /data/${branch}/app
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sql:query "truncate locales_location;"
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sql:query "truncate locales_source;"
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sql:query "truncate locales_target;"
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sql:query "truncate locale_file;"
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sql:query "delete from key_value where collection='locale.translation_status';"
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y sdel locale.translation_last_checked
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y locale:check
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y locale:update
+    - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g')
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_location;"
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_source;"
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locales_target;"
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "truncate locale_file;"
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sql:query "delete from key_value where collection='locale.translation_status';"
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y sdel locale.translation_last_checked
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y locale:check
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y locale:update
 
 ResetLocalesCustom:
   variables:
@@ -170,7 +174,8 @@ ResetLocalesCustom:
     - IFS=' ' read branch <<< ${CHAT_INPUT}
     - if [[ ! -d /data/${branch}/app ]]; then branch=main; fi
     - cd /data/${branch}/app
-    - docker compose --project-name ${CI_PROJECT_NAME}_${branch} exec php drush -y locale:import ${LANG} ${FILE} --type=custom --override=all
+    - SANITIZED_BRANCH_NAME=$(echo ${branch} | sed -r 's/[/_]+/-/g')
+    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush -y locale:import ${LANG} ${FILE} --type=custom --override=all
 
 DeployAssetsToDrupal:
   tags:
@@ -196,7 +201,6 @@ DeployAssetsToDrupal:
     - git clone -b ${ASSET_BRANCH} ${ASSET_REPO} vendor/${ASSET_PATH}
     - SANITIZED_BRANCH_NAME=$(echo ${CI_COMMIT_REF_NAME} | sed -r 's/[/_]+/-/g')
     - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush migrate:import --all --skip-progress-bar
-    - docker compose --project-name ${CI_PROJECT_NAME}_${SANITIZED_BRANCH_NAME} exec php drush migrate:import --all --skip-progress-bar
 
 Testing:
   variables: