Skip to content

Commit 262fd75

Browse files
committed
Escape sh arguments
1 parent e394de6 commit 262fd75

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

publish.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#!/bin/bash
22

3-
bash -c ./build.sh
3+
docker build src/ -t devforth/docker-database-glacierizer:latest
44
docker push devforth/docker-database-glacierizer:latest

src/scheduler.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ def send_slack_message(environment, message, success=True):
3333
try:
3434
client = WebhookClient(webhook_url)
3535
response = client.send(
36-
fallback=message,
3736
attachments=[
3837
{
3938
"color": "#36a64f" if success else "#ee2700",
@@ -127,8 +126,8 @@ def dump_database():
127126
dump_path = os.path.join('/tmp', filename)
128127

129128
dump_database_templates = {
130-
'mysql': 'set -o pipefail; mysqldump -h {host} -u {user} -p{password} --databases {database} -P {port} --protocol tcp | gzip -9 > {dump_path}',
131-
'postgresql': 'PGPASSWORD={password} pg_dump -h {host} -U {user} -d {database} -p {port} -Fp -Z9 > {dump_path}',
129+
'mysql': 'set -o pipefail; mysqldump -h "{host}" -u "{user}" -p"{password}" --databases "{database}" -P {port} --protocol tcp | gzip -9 > {dump_path}',
130+
'postgresql': 'PGPASSWORD="{password}" pg_dump -h "{host}" -U "{user}" -d "{database}" -p {port} -Fp -Z9 > {dump_path}',
132131
}
133132

134133
database_type = environment.get('DATABASE_TYPE').lower()
@@ -180,6 +179,8 @@ def dump_database():
180179
if __name__ == "__main__":
181180
environment = get_env()
182181

182+
print(f"|{os.getenv('SLACK_WEBHOOK')}|")
183+
183184
if environment.get('TEST'):
184185
import time
185186
time.sleep(10)

0 commit comments

Comments
 (0)