From a982063eaa9cecaeb60fe8061c3544ece2102de4 Mon Sep 17 00:00:00 2001
From: Masroor Ehsan <masroore@gmail.com>
Date: Mon, 27 Jan 2025 10:29:39 +0600
Subject: [PATCH] reorganization

---
 .env                                        |   3 ++-
 logo.png => config/ohif/logo.png            | Bin
 config/{nginx_ohif.conf => ohif/nginx.conf} |   0
 config/{orthanc_ohif.js => ohif/ohif.js}    |   0
 docker-compose.yml                          |  14 ++++++++------
 5 files changed, 10 insertions(+), 7 deletions(-)
 rename logo.png => config/ohif/logo.png (100%)
 rename config/{nginx_ohif.conf => ohif/nginx.conf} (100%)
 rename config/{orthanc_ohif.js => ohif/ohif.js} (100%)

diff --git a/.env b/.env
index 5f0c8f9..baa6afe 100644
--- a/.env
+++ b/.env
@@ -17,7 +17,8 @@ NGINX_DEFAULT_CONF=./config/nginx_ohif.conf
 #
 # OHIF Viewer
 #
-VIEWER_CONFIG=./config/ohif.js
+OHIF_CONFIG=./config/ohif.js
+OHIF_LOGO=./config/logo.png
 
 #
 # Orthanc core with plugins
diff --git a/logo.png b/config/ohif/logo.png
similarity index 100%
rename from logo.png
rename to config/ohif/logo.png
diff --git a/config/nginx_ohif.conf b/config/ohif/nginx.conf
similarity index 100%
rename from config/nginx_ohif.conf
rename to config/ohif/nginx.conf
diff --git a/config/orthanc_ohif.js b/config/ohif/ohif.js
similarity index 100%
rename from config/orthanc_ohif.js
rename to config/ohif/ohif.js
diff --git a/docker-compose.yml b/docker-compose.yml
index 15928dc..e03a08f 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   postgres:
-    image: postgres:17
+    image: postgres:17-alpine
     container_name: postgres
     networks:
       pacs:
@@ -18,9 +18,11 @@ services:
     volumes:
       - ${POSTGRES_DATA_MNT}:${PGDATA}
     healthcheck:
-      test: ["CMD", "pg_isready", "-q", "-d", "${DB_DATABASE}", "-U", "${DB_USERNAME}"]
-      retries: 3
-      timeout: 5s
+      test: ["CMD", "pg_isready", "-q", "-d", "${POSTGRES_DB}", "-U", "${POSTGRES_USER}"]
+      start_period: 20s
+      interval: 30s
+      retries: 5
+      timeout: 5s      
     restart: unless-stopped
 
   pgadmin:
@@ -75,8 +77,8 @@ services:
       - APP_CONFIG=/usr/share/nginx/html/app-config.js
     volumes:
       - ${NGINX_DEFAULT_CONF}:/etc/nginx/conf.d/default.conf:ro
-      - ${VIEWER_CONFIG}:/usr/share/nginx/html/app-config.js:ro
-      - ./logo.png:/usr/share/nginx/html/logo.png:ro
+      - ${OHIF_CONFIG}:/usr/share/nginx/html/app-config.js:ro
+      - ${OHIF_LOGO}:/usr/share/nginx/html/logo.png:ro
     restart: unless-stopped
     networks:
       pacs: