diff --git a/pica-graphbot/config.json b/pica-graphbot/config.json index 00f9e697069c53956966861d6d4b5e846b84fe06..59046ec457ec2e8e6b57f7bdf9b3b6fd6f5b7212 100644 --- a/pica-graphbot/config.json +++ b/pica-graphbot/config.json @@ -62,9 +62,9 @@ "type": "sftp", "hostname": "uploads.picasoft.net", "port": 2222, - "login": "pica", - "password": "SFTP_USER", - "remote_path": "SFTP_PASSWORD" + "login": "SFTP_USER", + "password": "SFTP_PASSWORD", + "remote_path": "uploads/graph_output" } ] } diff --git a/pica-graphbot/docker-compose.yml b/pica-graphbot/docker-compose.yml index f92e567f43d7cb810a17bef19e602b94673ec202..9bb5c5ff5daeee5ee8389c38078efaf8a2acdce4 100644 --- a/pica-graphbot/docker-compose.yml +++ b/pica-graphbot/docker-compose.yml @@ -20,7 +20,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock - output:/output environment: - CONFIG_FILE: "/config.json" + CONFIG_FILE: "/config_creds.json" OUTPUT_DIRECTORY: "/output" CERTS_DIRECTORY: "/certs" LOG_LEVEL: "warning" diff --git a/pica-graphbot/inject_env.sh b/pica-graphbot/inject_env.sh index e228356b3d79adefede1520457c671af85ecd785..9addb58c89fe42c4be7690283cda3f5b2846f505 100755 --- a/pica-graphbot/inject_env.sh +++ b/pica-graphbot/inject_env.sh @@ -11,8 +11,7 @@ if [ -z "${SFTP_PASSWORD}" ]; then fi echo "Inject SFTP credentials..." -sed -i "s/SFTP_USER/$SFTP_USER/g" /entrypoint.sh -sed -i "s/SFTP_PASSWORD/$SFTP_PASSWORD/g" /entrypoint.sh +sed "s/SFTP_USER/$SFTP_USER/g; s/SFTP_PASSWORD/$SFTP_PASSWORD/g" /config.json > /config_creds.json echo "Launching original entrypoint..." /entrypoint.sh