diff --git a/docker-compose.maintenance.yml b/docker-compose.maintenance.yml index aca042a54..b18f97513 100644 --- a/docker-compose.maintenance.yml +++ b/docker-compose.maintenance.yml @@ -8,9 +8,8 @@ services: volumes: - mongo-export:/mongo-export - uploads:/uploads - - ./maintenance/migration/:/migration - - ./maintenance/.ssh/:/root/.ssh/ - neo4j-data:/data + - ./maintenance/migration/:/migration networks: - hc-network environment: @@ -26,6 +25,7 @@ services: - NEO4J_AUTH=none - "SSH_USERNAME=${SSH_USERNAME}" - "SSH_HOST=${SSH_HOST}" + - "SSH_PRIVATE_KEY=${SSH_PRIVATE_KEY}" - "MONGODB_USERNAME=${MONGODB_USERNAME}" - "MONGODB_PASSWORD=${MONGODB_PASSWORD}" - "MONGODB_AUTH_DB=${MONGODB_AUTH_DB}" diff --git a/maintenance/binaries/create_private_ssh_key_from_env b/maintenance/binaries/create_private_ssh_key_from_env new file mode 100755 index 000000000..f44671978 --- /dev/null +++ b/maintenance/binaries/create_private_ssh_key_from_env @@ -0,0 +1,6 @@ +#!/usr/bin/env bash +set -e + +mkdir -p ~/.ssh +echo $SSH_PRIVATE_KEY | base64 -d > ~/.ssh/id_rsa +chmod 600 ~/.ssh/id_rsa diff --git a/maintenance/binaries/import_legacy_uploads b/maintenance/binaries/import_legacy_uploads index d24936e3b..73240715b 100755 --- a/maintenance/binaries/import_legacy_uploads +++ b/maintenance/binaries/import_legacy_uploads @@ -9,4 +9,5 @@ do fi done +create_private_ssh_key_from_env rsync --archive --update --verbose ${SSH_USERNAME}@${SSH_HOST}:${UPLOADS_DIRECTORY}/* /uploads/ diff --git a/maintenance/migration/mongo/import.sh b/maintenance/migration/mongo/import.sh index 15732e589..89c255a76 100755 --- a/maintenance/migration/mongo/import.sh +++ b/maintenance/migration/mongo/import.sh @@ -9,6 +9,8 @@ echo "MONGODB_DATABASE ${MONGODB_DATABASE}" echo "MONGODB_AUTH_DB ${MONGODB_AUTH_DB}" echo "-------------------------------------------------" +create_private_ssh_key_from_env + rm -rf /mongo-export/* ssh -4 -M -S my-ctrl-socket -fnNT -L 27018:localhost:27017 -l ${SSH_USERNAME} ${SSH_HOST}