Skip to content
Snippets Groups Projects
Commit b69fb89c authored by Corné Lukken's avatar Corné Lukken
Browse files

Merge branch 'fix-deploy-1' into 'master'

Fix deploy attempt 1/?

See merge request !1478
parents 83b17b4b 6a7a2715
No related branches found
No related tags found
1 merge request!1478Fix deploy attempt 1/?
......@@ -630,7 +630,6 @@ deploy-image-caches:
- sh -e ./generate-env.sh
- rm environment
- echo -en "${CBM206_PRIVATE_KEY}" > app/id_rsa
- ssh ${LOFAR_USER}@${LOFAR_TARGET} -p ${LOFAR_TARGET_PORT} 'mkdir -p ~/.lofar/tmss'
.deploy-tmss-prod:
stage: deploy-prod
......@@ -638,7 +637,6 @@ deploy-image-caches:
- *prepare_ssh
after_script:
- *prepare_ssh_agent
- ssh $LOFAR_USER@$LOFAR_TARGET -p ${LOFAR_TARGET_PORT} "cd .lofar/tmss; rm -rf lobster/.env; rm -rf lobster/env; tmss/.env; rm -rf tmss/env; rm -rf app/.env; rm -rf app/id_rsa"
needs:
- job: dockerize_TMSS
- job: test_TMSS
......
......@@ -2,7 +2,6 @@
# Base image for two-step docker-compose image generation
echo "SOURCE_IMAGE=${SOURCE_IMAGE}" > tmss/.env
echo "SOURCE_IMAGE=${SOURCE_IMAGE}" > lobster/.env
echo "export LTA_HOST=${LTA_HOST}" > app/.env
echo "export LTA_USER=${LTA_USER}" >> app/.env
......@@ -32,7 +31,7 @@ echo "export TMSS_SLACK_PORT=${TMSS_SLACK_PORT}" >> app/.env
echo "export TMSS_SLACK_DATABASE=${TMSS_SLACK_DATABASE}" >> app/.env
# Environment variables required by processes in containers
for folder in lobster tmss
for folder in tmss
do
echo "LOFARENV=${LOFARENV}" > ${folder}/env
# tmss django settings
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment