Skip to content
Snippets Groups Projects
Commit dff30be1 authored by Brittany Faciane's avatar Brittany Faciane
Browse files

remove vestigial e flag

parent e4dd4ea3
No related branches found
No related tags found
2 merge requests!1452Merge 2.8.2 to main,!1396changes for local builds
Pipeline #10305 failed
......@@ -436,7 +436,7 @@ deploy:
# This sed command finds and replaces "dsoc_ENV_secrets:" with "dsoc_${DEPLOY_ENV}_secrets:"
- sed -i "s/dsoc_ENV_secrets:/dsoc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
- sed -i "s/naasc_ENV_secrets:/naasc_${DEPLOY_ENV}_secrets:/g" docker-compose.yml
- ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.yml workspaces-${DEPLOY_ENV} -e TAG=${IMAGE_TAG}
- ENV=$DEPLOY_ENV TAG=$IMAGE_TAG DL_HOST=$DL_HOST ENV_HOST=$ENV_HOST docker stack deploy --compose-file docker-compose.local.yml workspaces-${DEPLOY_ENV}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/ || $CI_PIPELINE_SOURCE == "merge_request_event"'
variables:
......
......@@ -3,8 +3,6 @@
script:
- echo "$HARBOR_PASSWORD" | docker login -u "$HARBOR_USER" --password-stdin $REGISTRY_URL
- NAME="${REGISTRY_URL}/workspaces/${SERVICE_NAME}"
- echo "${NAME}"
- echo "${IMAGE_TAG}"
- docker push ${NAME}:${IMAGE_TAG}
rules:
- if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /(^[0-9]\.[0-9]|^[0-9]\.[0-9]\.[0-9])-DEVELOPMENT/'
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment