From 1c79c31a2c40686c23e633402c05d29b8b99bf1f Mon Sep 17 00:00:00 2001
From: Triono Putra <triono.putra24@gmail.com>
Date: Thu, 29 May 2025 13:32:33 +0700
Subject: [PATCH] Oks

---
 Dockerfile         | 18 +++++++++++-------
 docker-compose.yml | 21 ++++++++++-----------
 2 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9e7d48a..4546969 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -25,21 +25,25 @@ WORKDIR /var/www
 COPY . .
 COPY .env.example .env
 
-# Set www-data user permission before running composer/install artisan
+# Set permission
 RUN chown -R www-data:www-data /var/www
 
 USER www-data
 
-# Install dependencies & generate app key as www-data user
-#RUN composer install --no-interaction --prefer-dist --optimize-autoloader \
-#git    && php artisan key:generate
+# Install dependencies & generate app key
+RUN composer install --no-interaction --prefer-dist --optimize-autoloader
+
+# Uncomment if you want to generate key automatically (optional)
+# RUN php artisan key:generate
 
 USER root
 
-# Set permissions again just in case
+# Set storage & cache permission
 RUN chown -R www-data:www-data /var/www/storage /var/www/bootstrap/cache \
     && chmod -R 775 /var/www/storage /var/www/bootstrap/cache
 
+# Expose default Laravel serve port
+EXPOSE 8000
 
-EXPOSE 9000
-CMD ["php-fpm"]
+# Use artisan serve instead of php-fpm
+CMD ["php", "artisan", "serve", "--host=0.0.0.0", "--port=8000"]
diff --git a/docker-compose.yml b/docker-compose.yml
index 0679a1c..efecccd 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,4 @@
-version: "3"
+version: "3.8"
 
 services:
   sistem-akademik-dev:
@@ -6,10 +6,9 @@ services:
     container_name: sistem-akademik-dev
     volumes:
       - .:/var/www
-      - ./storage:/var/www/storage
     working_dir: /var/www
     ports:
-      - "8000:8000"  # port artisan serve
+      - "8000:8000"  # Laravel Artisan Serve port
     restart: always
     environment:
       APP_ENV: production
@@ -23,16 +22,16 @@ services:
       DB_PASSWORD: postroot123
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.web-http.entrypoints=web"
-      - "traefik.http.routers.web-http.rule=Host(`siska.appstaging.my.id`)"
-      - "traefik.http.routers.web-http.middlewares=redirect-to-https"
-      - "traefik.http.routers.web.entrypoints=websecure"
-      - "traefik.http.routers.web.tls.certresolver=myresolver"
-      - "traefik.http.routers.web.rule=Host(`siska.appstaging.my.id`)"
-      - 'traefik.http.routers.web.tls=true'
+      - "traefik.http.routers.sistem-akademik-dev-http.entrypoints=web"
+      - "traefik.http.routers.sistem-akademik-dev-http.rule=Host(`siska.appstaging.my.id`)"
+      - "traefik.http.routers.sistem-akademik-dev-http.middlewares=redirect-to-https"
+      - "traefik.http.routers.sistem-akademik-dev.entrypoints=websecure"
+      - "traefik.http.routers.sistem-akademik-dev.tls.certresolver=myresolver"
+      - "traefik.http.routers.sistem-akademik-dev.rule=Host(`siska.appstaging.my.id`)"
+      - "traefik.http.routers.sistem-akademik-dev.tls=true"
     networks:
       - traefik_default  
 
 networks:
   traefik_default:
-    external: true
\ No newline at end of file
+    external: true