Merge pull request #19 from izzatbey/fix-healthcheck

Fix Health Check in Postgre Service
mata-elang-stable · Feb 24, 2025 · 36697b4 · 36697b4
2 parents 171781c + c5f6977
commit 36697b4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 130 deletions.
diff --git a/.env.example b/.env.example
@@ -1,8 +1,8 @@
-APP_NAME=Laravel
-APP_ENV=local
+APP_NAME='Mata Elang Report Site'
+APP_ENV=production
 APP_KEY=
 APP_DEBUG=true
-APP_TIMEZONE=UTC
+APP_TIMEZONE=Asia/Jakarta
 APP_URL=http://localhost
 
 APP_LOCALE=en

diff --git a/composer.json b/composer.json
@@ -10,7 +10,6 @@
     "license": "MIT",
     "require": {
         "php": "^8.2",
-        "barryvdh/laravel-dompdf": "*",
         "laravel/framework": "^11.31",
         "laravel/jetstream": "^5.3",
         "laravel/sanctum": "^4.0",

diff --git a/composer.lock b/composer.lock
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,61 +1,39 @@
 services:
-    laravel.test:
-        build:
-            context: ./docker/8.4
-            dockerfile: Dockerfile
-            args:
-                WWWGROUP: '${WWWGROUP}'
-        image: sail-8.4/app
-        extra_hosts:
-            - 'host.docker.internal:host-gateway'
-        ports:
-            - '${APP_PORT:-80}:80'
-            - '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
-        environment:
-            WWWUSER: '${WWWUSER}'
-            LARAVEL_SAIL: 1
-            XDEBUG_MODE: '${SAIL_XDEBUG_MODE:-off}'
-            XDEBUG_CONFIG: '${SAIL_XDEBUG_CONFIG:-client_host=host.docker.internal}'
-            IGNITION_LOCAL_SITES_PATH: '${PWD}'
-        volumes:
-            - '.:/var/www/html'
-        networks:
-            - sail
+    report-api:
+        image: ghcr.io/mata-elang-stable/report-api-services:latest
+        build: .
         depends_on:
-            - pgsql
-            - redis
-
-    # report-api:
-    #     image: ghcr.io/mata-elang-stable/report-api-services:latest
-    #     build: .
-    #     depends_on:
-    #     - pgsql
-    #     - web
-    #     - redis
-    #     - chromium
-    #     env_file:
-    #         - .env
-    #     volumes:
-    #         - report_data:/var/www/html/
-    #     deploy:
-    #     restart_policy:
-    #         condition: on-failure
-    #         delay: 15s
-    #     mode: replicated
-    #     replicas: 1
-    #     resources:
-    #         limits:
-    #         cpus: "0.5"
-    #         memory: 1G
+            pgsql:
+                condition: service_healthy
+            redis:
+                condition: service_healthy
+            chromium:
+                condition: service_started
+            web:
+                condition: service_started
+        env_file:
+            - .env
+        volumes:
+            - report_data:/var/www/html/
+        deploy:
+            restart_policy:
+                condition: on-failure
+                delay: 15s
+            mode: replicated
+            replicas: 1
+            resources:
+                limits:
+                    cpus: "0.5"
+                    memory: 1G
 
     web:
         image: nginx:alpine
         restart: unless-stopped
         ports:
-        - "8080:80"
+        - "8085:80"
         volumes:
         - ./nginx.conf:/etc/nginx/conf.d/default.conf
-        - report_data:/var/www/html/
+        - report_data:/var/www/html/:ro
 
     chromium:
         image: zenika/alpine-chrome
@@ -116,3 +94,4 @@ volumes:
     sail-redis:
         driver: local
     report_data:
+        driver: local