From 4ecc95b5b4591917049b241dba58c40c88874cc2 Mon Sep 17 00:00:00 2001
From: Gladys23 <d1041231011@student.untan.ac.id>
Date: Thu, 11 Jun 2026 16:43:59 +0700
Subject: [PATCH] Use inline Docker Compose web build

---
 .dockerignore       |  2 ++
 Dockerfile          | 11 -----------
 docker-compose.yaml | 29 +++++++++++++++++++++--------
 3 files changed, 23 insertions(+), 19 deletions(-)
 delete mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
index 49f79b7..9008367 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -3,6 +3,8 @@
 .codex
 .env
 docker-compose.yml
+docker-compose.yaml
+Dockerfile
 node_modules
 vendor
 *.log
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index 3b8c7f2..0000000
--- a/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM php:8.2-apache
-
-RUN docker-php-ext-install mysqli pdo pdo_mysql \
-    && a2enmod rewrite
-
-COPY . /var/www/html/
-
-RUN mkdir -p /var/www/html/05/webgis_uas_FIXED_v2/webgis_uas_FIXED/uploads/bukti \
-    && chown -R www-data:www-data /var/www/html
-
-EXPOSE 80
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 3962934..bed2fc2 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -1,6 +1,19 @@
 services:
   web:
-    build: .
+    build:
+      context: .
+      dockerfile_inline: |
+        FROM php:8.2-apache
+
+        RUN docker-php-ext-install mysqli pdo pdo_mysql \
+            && a2enmod rewrite
+
+        COPY . /var/www/html/
+
+        RUN mkdir -p /var/www/html/05/webgis_uas_FIXED_v2/webgis_uas_FIXED/uploads/bukti \
+            && chown -R www-data:www-data /var/www/html
+
+        EXPOSE 80
     restart: unless-stopped
     expose:
       - "80"
@@ -8,8 +21,8 @@ services:
       SERVICE_FQDN_WEBGIS:
       DB_HOST: mysql
       DB_PORT: 3306
-      DB_USER: ${MYSQL_USER:?webgis}
-      DB_PASSWORD: ${MYSQL_PASSWORD:?}
+      DB_USER: ${MYSQL_USER:-webgis}
+      DB_PASSWORD: ${MYSQL_PASSWORD:-webgis_password}
       DB_NAME_GIS_SPBU: gis_spbu
       DB_NAME_DATA_JALAN: data_jalan
       DB_NAME_WEBGIS: webgis
@@ -27,10 +40,10 @@ services:
     image: mysql:8.0
     restart: unless-stopped
     environment:
-      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:?}
+      MYSQL_ROOT_PASSWORD: ${MYSQL_ROOT_PASSWORD:-root_password}
       MYSQL_DATABASE: gis_spbu
-      MYSQL_USER: ${MYSQL_USER:?webgis}
-      MYSQL_PASSWORD: ${MYSQL_PASSWORD:?}
+      MYSQL_USER: ${MYSQL_USER:-webgis}
+      MYSQL_PASSWORD: ${MYSQL_PASSWORD:-webgis_password}
     volumes:
       - mysql_data:/var/lib/mysql
       - ./01/database_01.sql:/docker-entrypoint-initdb.d/01_database_01.sql:ro
@@ -52,8 +65,8 @@ services:
       SERVICE_FQDN_PHPMYADMIN:
       PMA_HOST: mysql
       PMA_PORT: 3306
-      PMA_USER: ${MYSQL_USER:?webgis}
-      PMA_PASSWORD: ${MYSQL_PASSWORD:?}
+      PMA_USER: ${MYSQL_USER:-webgis}
+      PMA_PASSWORD: ${MYSQL_PASSWORD:-webgis_password}
       PMA_ABSOLUTE_URI: ${SERVICE_URL_PHPMYADMIN:-}
     depends_on:
       mysql: