diff --git a/Dockerfile b/Dockerfile index fb205fa..24c09ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -57,16 +57,12 @@ RUN chown -R www-data:www-data /var/www/html \ && chmod -R 775 /var/www/html/storage \ && chmod -R 775 /var/www/html/bootstrap/cache -# Konfigurasi Nginx presisi untuk subpath /sidata dan PHP-FPM +# Konfigurasi Nginx Standar Laravel (Merespons di Root /) RUN echo 'server { \ listen 80; \ index index.php index.html; \ root /var/www/html/public; \ \ - location /sidata { \ - try_files $uri $uri/ /sidata/index.php?$query_string; \ - } \ - \ location / { \ try_files $uri $uri/ /index.php?$query_string; \ } \ @@ -75,14 +71,11 @@ RUN echo 'server { \ fastcgi_pass 127.0.0.1:9000; \ fastcgi_index index.php; \ include fastcgi_params; \ - fastcgi_param SCRIPT_FILENAME /var/www/html/public/index.php; \ - fastcgi_param SCRIPT_NAME $fastcgi_script_name; \ + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; \ } \ }' > /etc/nginx/sites-available/default -# ... (bagian atas Dockerfile tetap sama) ... - EXPOSE 80 -# Script startup: Buat .env dari variabel environment Helm jika .env belum ada, lalu jalankan service +# Script startup: Buat .env dari variabel environment Helm, lalu jalankan service CMD ["sh", "-c", "env | grep -E '^(APP_|DB_|MYSQL_|ORA_|REDIS_|MAIL_|SESSION_|SOA_)' > /var/www/html/.env && redis-server --daemonize yes && php-fpm -D && exec nginx -g 'daemon off;'"] \ No newline at end of file diff --git a/helm/sidata/values.yaml b/helm/sidata/values.yaml index 97e9a32..d7d5e74 100644 --- a/helm/sidata/values.yaml +++ b/helm/sidata/values.yaml @@ -15,12 +15,13 @@ ingress: enabled: true className: nginx annotations: - # HAPUS rewrite-target agar URL /sidata diteruskan utuh ke Pod - # Nginx di dalam Pod kita sudah punya 'location /sidata' - nginx.ingress.kubernetes.io/ssl-redirect: "false" - host: dashboard-bpkd.drc-bpkd.data-center.id - path: /sidata - pathType: Prefix + nginx.ingress.kubernetes.io/use-regex: "true" + nginx.ingress.kubernetes.io/rewrite-target: /$2 + hosts: + - host: dashboard-bpkd.drc-bpkd.data-center.id + paths: + - path: /sidata(/|$)(.*) + pathType: ImplementationSpecific env: APP_NAME: "SIDATA"