Skip to content

Commit

Permalink
Merge pull request #1096 from GSA/1094-remove-sed-for-missing-file-in…
Browse files Browse the repository at this point in the history
…-circle-pipeline

#1094: Add command overrride in dev env.
  • Loading branch information
casey-rapnicki-bixal authored Mar 20, 2024
2 parents a2b90dc + fb45f36 commit 35ea7ca
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,6 @@ jobs:
sed -i "s/\$settings\['hash_salt'\] = \$service\['credentials'\]\['HASH_SALT'\]/\$settings\['hash_salt'\] = \$service\['credentials'\]\['hash_salt'\]/" web/sites/default/settings.php
sed -i "s/\$service\['name'\] === 'storage'/stristr(\$service\['name'\], 'storage')/" web/sites/default/settings.php
sed -i "s/\$service\['name'\] === 'secrets'/stristr(\$service\['name'\], 'secrets')/" web/sites/default/settings.php
echo -e "\nif [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ -z "${SKIP_DRUPAL_BOOTSTRAP:-}" ]; then"
echo -e "\t./scripts/entrypoint.sh" >> scripts/bootstrap.sh
echo "fi"
- run:
name: Building, tagging, pushing the Docker Image
Expand Down Expand Up @@ -82,6 +79,7 @@ jobs:
sed -i "s#^ - secrets# - benefit-finder-secrets-${CIRCLE_BRANCH}#" manifest.yml
sed -i "s#^ - storage# - benefit-finder-storage-${CIRCLE_BRANCH}#" manifest.yml
sed -i "s#^ - dbstorage# - benefit-finder-static-${CIRCLE_BRANCH}#" manifest.yml
sed -i '16i\ command: ./scripts/entrypoint.sh' manifest.yml
cat manifest.yml
- run:
Expand Down Expand Up @@ -174,9 +172,6 @@ jobs:
sed -i "s/\$settings\['hash_salt'\] = \$service\['credentials'\]\['HASH_SALT'\]/\$settings\['hash_salt'\] = \$service\['credentials'\]\['hash_salt'\]/" web/sites/default/settings.php
sed -i "s/\$service\['name'\] === 'storage'/stristr(\$service\['name'\], 'storage')/" web/sites/default/settings.php
sed -i "s/\$service\['name'\] === 'secrets'/stristr(\$service\['name'\], 'secrets')/" web/sites/default/settings.php
echo -e "\nif [ "${CF_INSTANCE_INDEX:-''}" == "0" ] && [ -z "${SKIP_DRUPAL_BOOTSTRAP:-}" ]; then"
echo -e "\t./scripts/entrypoint.sh" >> scripts/bootstrap.sh
echo "fi"
- run:
name: Building, tagging, pushing the Docker Image
Expand Down

0 comments on commit 35ea7ca

Please sign in to comment.