From 929e06eddc0995ed7bbfa53f97c34ef8e7591706 Mon Sep 17 00:00:00 2001
From: Nama Kamu <emailkamu@example.com>
Date: Fri, 12 Jun 2026 13:25:38 +0700
Subject: [PATCH] perbaikan struktur compose

---
 01/koneksi.php                  |  9 ++--
 02/db.php                       |  9 ++--
 04/koneksi.php                  |  9 ++--
 05/koneksi.php                  |  9 ++--
 Dockerfile                      | 10 ++--
 Dockerfile.db                   |  2 +
 docker-compose.yml              | 85 +++++++++++++++++++++++----------
 init.sql => migrations/init.sql |  4 +-
 8 files changed, 86 insertions(+), 51 deletions(-)
 create mode 100644 Dockerfile.db
 rename init.sql => migrations/init.sql (99%)

diff --git a/01/koneksi.php b/01/koneksi.php
index 1b6d218..220f328 100644
--- a/01/koneksi.php
+++ b/01/koneksi.php
@@ -1,10 +1,11 @@
 <?php
 $host = getenv('DB_HOST') ?: 'db';
-$user = getenv('DB_USER') ?: 'root';
-$pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = getenv('DB_NAME') ?: 'uas_06';
+$port = getenv('DB_PORT') ?: 3306;
+$user = getenv('DB_USERNAME') ?: 'webgis_user';
+$pass = getenv('DB_PASSWORD') ?: 'webgis_password';
+$db   = getenv('DB_DATABASE') ?: 'webgis_spbu';
 
-$conn = @mysqli_connect($host, $user, $pass, $db);
+$conn = @mysqli_connect($host, $user, $pass, $db, $port);
 
 if (!$conn) {
     header('Content-Type: application/json');
diff --git a/02/db.php b/02/db.php
index 49fbe00..1060391 100644
--- a/02/db.php
+++ b/02/db.php
@@ -1,8 +1,9 @@
 <?php
 
 $host = getenv('DB_HOST') ?: 'db';
-$user = getenv('DB_USER') ?: 'root';
-$pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = getenv('DB_NAME') ?: 'uas_06';
+$port = getenv('DB_PORT') ?: 3306;
+$user = getenv('DB_USERNAME') ?: 'webgis_user';
+$pass = getenv('DB_PASSWORD') ?: 'webgis_password';
+$db   = getenv('DB_DATABASE') ?: 'webgis_spbu';
 
-$conn = @mysqli_connect($host, $user, $pass, $db);
+$conn = @mysqli_connect($host, $user, $pass, $db, $port);
diff --git a/04/koneksi.php b/04/koneksi.php
index 0f040b8..8e4df08 100644
--- a/04/koneksi.php
+++ b/04/koneksi.php
@@ -1,10 +1,11 @@
 <?php
 $host = getenv('DB_HOST') ?: 'db';
-$user = getenv('DB_USER') ?: 'root';
-$pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = getenv('DB_NAME') ?: 'uas_06';
+$port = getenv('DB_PORT') ?: 3306;
+$user = getenv('DB_USERNAME') ?: 'webgis_user';
+$pass = getenv('DB_PASSWORD') ?: 'webgis_password';
+$db   = getenv('DB_DATABASE') ?: 'webgis_spbu';
 
-$conn = @mysqli_connect($host, $user, $pass, $db);
+$conn = @mysqli_connect($host, $user, $pass, $db, $port);
 
 if (!$conn) {
     die("Koneksi database gagal: " . mysqli_connect_error());
diff --git a/05/koneksi.php b/05/koneksi.php
index 23f91f2..05b7789 100644
--- a/05/koneksi.php
+++ b/05/koneksi.php
@@ -3,11 +3,12 @@
 //  koneksi.php  –  Database uas_06
 // ============================================================
 $host = getenv('DB_HOST') ?: 'db';
-$user = getenv('DB_USER') ?: 'root';
-$pass = getenv('DB_PASSWORD') ?: 'rootpassword';
-$db   = getenv('DB_NAME') ?: 'uas_06';
+$port = getenv('DB_PORT') ?: 3306;
+$user = getenv('DB_USERNAME') ?: 'webgis_user';
+$pass = getenv('DB_PASSWORD') ?: 'webgis_password';
+$db   = getenv('DB_DATABASE') ?: 'webgis_spbu';
 
-$conn = @mysqli_connect($host, $user, $pass, $db);
+$conn = @mysqli_connect($host, $user, $pass, $db, $port);
 
 if (!$conn) {
     http_response_code(500);
diff --git a/Dockerfile b/Dockerfile
index 2a67fb5..39afedb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,9 @@
 FROM php:8.2-apache
 
-RUN docker-php-ext-install mysqli pdo pdo_mysql \
-    && a2enmod rewrite
-
-WORKDIR /var/www/html
+RUN docker-php-ext-install mysqli
 
 COPY . /var/www/html/
 
-RUN mkdir -p /var/www/html/05/uploads/bukti \
-    && chown -R www-data:www-data /var/www/html
+RUN chown -R www-data:www-data /var/www/html
 
-CMD ["apache2-foreground"]
+EXPOSE 80
diff --git a/Dockerfile.db b/Dockerfile.db
new file mode 100644
index 0000000..abedf87
--- /dev/null
+++ b/Dockerfile.db
@@ -0,0 +1,2 @@
+FROM mysql:8.4
+COPY ./migrations /docker-entrypoint-initdb.d/
diff --git a/docker-compose.yml b/docker-compose.yml
index 9440eab..dbe1912 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,37 +1,72 @@
 services:
   app:
-    build: .
-    ports:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    expose:
       - "80"
     environment:
-      # Koneksi database menunjuk ke container 'db'
-      - DB_HOST=db
-      - DB_USER=root
-      - DB_PASSWORD=rootpassword
-      # Nama database utama
-      - DB_NAME=uas_06
+      DB_HOST: db
+      DB_PORT: 3306
+      DB_DATABASE: webgis_spbu
+      DB_USERNAME: webgis_user
+      DB_PASSWORD: webgis_password
     depends_on:
-      db:
-        condition: service_healthy
-    restart: always
+      migrate:
+        condition: service_completed_successfully
+    restart: unless-stopped
 
   db:
-    image: mysql:8.0
+    build:
+      context: .
+      dockerfile: Dockerfile.db
+    image: webgis-db
     environment:
-      - MYSQL_ROOT_PASSWORD=rootpassword
-      - MYSQL_DATABASE=uas_06
-    ports:
+      MYSQL_DATABASE: webgis_spbu
+      MYSQL_USER: webgis_user
+      MYSQL_PASSWORD: webgis_password
+      MYSQL_ROOT_PASSWORD: root_password
+    expose:
       - "3306"
     volumes:
-      - db_data:/var/lib/mysql
-      # Auto-import database terpadu
-      - ./init.sql:/docker-entrypoint-initdb.d/init.sql
-    healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-    restart: always
+      - webgis_db_data:/var/lib/mysql
+    restart: unless-stopped
+
+  migrate:
+    build:
+      context: .
+      dockerfile: Dockerfile.db
+    image: webgis-db
+    environment:
+      MYSQL_PWD: root_password
+    depends_on:
+      - db
+    command: >
+      sh -c "
+      until mysqladmin ping -h db -uroot --password=$$MYSQL_PWD --silent 2>/dev/null; do
+        echo 'Waiting for database...';
+        sleep 2;
+      done;
+      sleep 3;
+      echo 'mysqld is alive';
+      for file in /docker-entrypoint-initdb.d/*.sql; do
+        echo \"Running $$file\";
+        mysql -h db -uroot --password=$$MYSQL_PWD < $$file || exit 1;
+      done;
+      echo 'All migrations done.';
+      "
+    restart: "no"
+
+  phpmyadmin:
+    image: phpmyadmin:latest
+    expose:
+      - "80"
+    environment:
+      PMA_HOST: db
+      PMA_PORT: 3306
+    depends_on:
+      - db
+    restart: unless-stopped
 
 volumes:
-  db_data:
+  webgis_db_data:
diff --git a/init.sql b/migrations/init.sql
similarity index 99%
rename from init.sql
rename to migrations/init.sql
index 162a5de..da47e7f 100644
--- a/init.sql
+++ b/migrations/init.sql
@@ -1,6 +1,4 @@
-CREATE DATABASE IF NOT EXISTS `uas_06` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;
-USE `uas_06`;
-
+
 -- ============================================================
 -- Bawaan 05
 -- ============================================================