From 05661032b310120aee7b5f63f2bf78bfa582ab40 Mon Sep 17 00:00:00 2001
From: Aleksandr Soloshenko <capcom@soft-c.ru>
Date: Fri, 24 May 2024 09:27:11 +0700
Subject: [PATCH] [docker] fix healthcheck

---
 .dockerignore                                 |  6 +++++-
 api/requests.http                             |  2 +-
 build/package/Dockerfile                      |  2 +-
 deployments/docker-compose/docker-compose.yml | 10 +++++-----
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 67e7d25..fff6a29 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -44,4 +44,8 @@ LICENSE
 .dockerignore
 
 # Ignore the Go build directory
-tmp/
\ No newline at end of file
+tmp/
+
+# Ignore build and deployments directories
+deployments/
+build/
\ No newline at end of file
diff --git a/api/requests.http b/api/requests.http
index 51c7f63..aaafc26 100644
--- a/api/requests.http
+++ b/api/requests.http
@@ -4,7 +4,7 @@
 @phone={{$dotenv PHONE}}
 
 ###
-GET http://localhost:3000/health HTTP/1.1
+GET {{baseUrl}}/health HTTP/1.1
 
 ###
 GET {{baseUrl}}/api/3rdparty/v1/health HTTP/1.1
diff --git a/build/package/Dockerfile b/build/package/Dockerfile
index 097d988..7d6bf12 100644
--- a/build/package/Dockerfile
+++ b/build/package/Dockerfile
@@ -46,6 +46,6 @@ COPY --from=build /go/src/app /app
 EXPOSE 3000
 
 USER guest
-HEALTHCHECK --interval=10s --timeout=3s --retries=3 --start-period=5s CMD [ "/app/app" "health" ]
+HEALTHCHECK --interval=10s --timeout=3s --retries=3 --start-period=5s CMD /app/app health || exit 1
 
 ENTRYPOINT ["/docker-entrypoint.sh"]
diff --git a/deployments/docker-compose/docker-compose.yml b/deployments/docker-compose/docker-compose.yml
index 1d5936c..c762978 100644
--- a/deployments/docker-compose/docker-compose.yml
+++ b/deployments/docker-compose/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3'
 services:
   backend:
     image: capcom6/sms-gateway
@@ -8,7 +7,7 @@ services:
       args:
         - APP=sms-gateway
     environment:
-      - DEBUG=1
+      - DEBUG=
       - CONFIG_PATH=config.yml
       - GOOSE_DBSTRING=sms:sms@tcp(db:3306)/sms
       - HTTP__LISTEN=0.0.0.0:3000
@@ -21,21 +20,22 @@ services:
       - "3000:3000"
     volumes:
       - ../../configs/config.yml:/app/config.yml:ro
-    restart: 'no'
+    restart: 'unless-stopped'
     depends_on:
       db:
         condition: service_healthy
 
   db:
-    image: mariadb:10.6
+    image: mariadb:10.11
     environment:
       - MYSQL_ROOT_PASSWORD=root
       - MYSQL_DATABASE=sms
       - MYSQL_USER=sms
       - MYSQL_PASSWORD=sms
+      - MARIADB_AUTO_UPGRADE=1
     volumes:
       - mariadb-data:/var/lib/mysql
-    restart: 'no'
+    restart: 'unless-stopped'
     healthcheck:
       test:
         [