From d9c14b4158fa3848a0939e747359c0cb7ad9d7ef Mon Sep 17 00:00:00 2001 From: Ilya Mukhortov Date: Wed, 13 Jan 2021 23:17:06 +1000 Subject: [PATCH] pass --- backup_database.sh | 2 +- medicine-stack/docker-compose.yml | 1 + medicine/run.sh | 2 ++ restore_database.sh | 4 ++++ utils.sh | 13 +++++++++++++ 5 files changed, 21 insertions(+), 1 deletion(-) mode change 100644 => 100755 backup_database.sh create mode 100644 utils.sh diff --git a/backup_database.sh b/backup_database.sh old mode 100644 new mode 100755 index 4f6f5f9..f0c1e8b --- a/backup_database.sh +++ b/backup_database.sh @@ -11,4 +11,4 @@ docker exec -i medicine-stack-postgres \ medicine > "${backup_filename}" \ --exclude-table-data=riisz_logging --exclude-table-data=reversion_* -echo backup_filename +echo $backup_filename diff --git a/medicine-stack/docker-compose.yml b/medicine-stack/docker-compose.yml index 8a2c86b..0b1f8e8 100644 --- a/medicine-stack/docker-compose.yml +++ b/medicine-stack/docker-compose.yml @@ -27,6 +27,7 @@ services: POSTGRES_PASSWORD: "password" volumes: - ./volumes/postgres-data:/var/lib/postgresql/data + - ./volumes/files:/files logging: driver: "json-file" options: diff --git a/medicine/run.sh b/medicine/run.sh index a050e81..8f7e2cf 100644 --- a/medicine/run.sh +++ b/medicine/run.sh @@ -2,6 +2,8 @@ set -e +export PYTHONIOENCODING=utf8 + COMMAND="$1" ARGUMENT="$2" diff --git a/restore_database.sh b/restore_database.sh index 823d8fe..31a5cfb 100644 --- a/restore_database.sh +++ b/restore_database.sh @@ -2,3 +2,7 @@ set -e +docker exec -i medicine-stack-postgres psql -c 'DROP DATABASE IF EXISTS medicine' --username=postgres; +docker exec -i medicine-stack-postgres psql -c 'CREATE DATABASE medicine' --username=postgres; +docker cp medicine-stack-postgres:/backup.tar.gz +docker exec medicine-stack-postgres pg_restore --dbname=medicine /backup.tar.gz --username=postgres; \ No newline at end of file diff --git a/utils.sh b/utils.sh new file mode 100644 index 0000000..05870d7 --- /dev/null +++ b/utils.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +set -e + +COMMAND="$1" +ARGUMENT="$2" + +git_ignore_filemode() { + git config core.fileMode false +} + + +${COMMAND}