From fb84bd96772c3dcb7cce8d0dff555fc8945c4fca Mon Sep 17 00:00:00 2001 From: Praveen Date: Wed, 13 Nov 2024 17:54:07 +0530 Subject: [PATCH 1/4] Change to wget from curl --- application/backup.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/application/backup.sh b/application/backup.sh index 19dfb23..aefa684 100755 --- a/application/backup.sh +++ b/application/backup.sh @@ -6,19 +6,19 @@ error_to_sentry() { local db_name="$2" local status_code="$3" - if [ ! -z "${SENTRY_DSN}" ]; then - curl -X POST "${SENTRY_DSN}" \ - -H "Content-Type: application/json" \ - -d "{ - \"message\": \"${error_message}\", - \"level\": \"error\", - \"extra\": { - \"database\": \"${db_name}\", - \"status_code\": \"${status_code}\", - \"hostname\": \"${HOSTNAME}\" - } -}" - fi + if [ ! -z "${SENTRY_DSN}" ]; then + wget -q --header="Content-Type: application/json" \ + --post-data="{ + \"message\": \"${error_message}\", + \"level\": \"error\", + \"extra\": { + \"database\": \"${db_name}\", + \"status_code\": \"${status_code}\", + \"hostname\": \"${HOSTNAME}\" + } +}" \ + -O - "${SENTRY_DSN}" +fi } STATUS=0 From 6c4e65091dd57683ef1a7d30798348ad4f23a866 Mon Sep 17 00:00:00 2001 From: Praveen Date: Wed, 13 Nov 2024 17:59:18 +0530 Subject: [PATCH 2/4] Change spacing --- application/backup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/backup.sh b/application/backup.sh index aefa684..258ff90 100755 --- a/application/backup.sh +++ b/application/backup.sh @@ -6,7 +6,7 @@ error_to_sentry() { local db_name="$2" local status_code="$3" - if [ ! -z "${SENTRY_DSN}" ]; then +if [ ! -z "${SENTRY_DSN}" ]; then wget -q --header="Content-Type: application/json" \ --post-data="{ \"message\": \"${error_message}\", From 40e21dffb9a12dc0cfd5b03b8a07295c6b82dc12 Mon Sep 17 00:00:00 2001 From: Praveen Date: Thu, 21 Nov 2024 19:32:50 +0530 Subject: [PATCH 3/4] removing the silintl/data-volume:latest --- docker-compose.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index d3b5033..f87f94c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,13 +1,8 @@ services: - data: - image: silintl/data-volume:latest - volumes: - - ./application:/data - db: image: mariadb:10 - volumes_from: - - data + volumes: + - ./application:/data ports: - "3306" environment: From a8f570bdbe95752da341ec91810a96265be693dd Mon Sep 17 00:00:00 2001 From: Praveen Date: Thu, 21 Nov 2024 19:55:06 +0530 Subject: [PATCH 4/4] Removed the data-image --- docker-compose.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index f87f94c..d99f41b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -21,8 +21,8 @@ services: restore: build: ./ - volumes_from: - - data + volumes: + - ./application:/data # volumes: # - ./test/world.sql.gz:/tmp/world.sql.gz # - ./test/employees.sql.gz:/tmp/employees.sql.gz @@ -38,8 +38,8 @@ services: backup: build: ./ - volumes_from: - - data + volumes: + - ./application:/data env_file: - ./local.env environment: