From f98eb1a24d86a5b0d2f0f546ab780ddd39eb8e1e Mon Sep 17 00:00:00 2001
From: Quentin Duchemin <quentinduchemin@tuta.io>
Date: Tue, 4 Aug 2020 17:02:34 +0200
Subject: [PATCH] [GraphBot] Fix secrets injection
---
pica-graphbot/config.json | 6 +++---
pica-graphbot/docker-compose.yml | 2 +-
pica-graphbot/inject_env.sh | 3 +--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/pica-graphbot/config.json b/pica-graphbot/config.json
index 00f9e697..59046ec4 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 f92e567f..9bb5c5ff 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 e228356b..9addb58c 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
--
GitLab