From ac2d1f411cb2746d4fecf81402a9aa6bcec163a1 Mon Sep 17 00:00:00 2001
From: Kenneth Ezekiel <88850771+KenEzekiel@users.noreply.github.com>
Date: Fri, 17 Nov 2023 12:30:35 +0700
Subject: [PATCH] fix: forbidden access

---
 Dockerfile                          |  4 +++-
 README.md                           |  9 +++++++++
 docker-compose.yml                  | 11 +++++++----
 src/database/DatabaseConnection.php |  2 +-
 4 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index bbea833..9091443 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,4 @@
 FROM php:8.0-apache
-EXPOSE 8008
 
 # (php mysql)
 RUN rm -f /etc/apt/apt.conf.d/docker-clean \
@@ -9,5 +8,8 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
 
 RUN docker-php-ext-install pdo pdo_mysql
 
+COPY . /var/www/html/
+RUN chown -R www-data:www-data /var/www/html
+
 COPY ./php.ini /usr/local/etc/php/php.ini
 RUN a2enmod rewrite
\ No newline at end of file
diff --git a/README.md b/README.md
index f4d5756..002e8a1 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,7 @@
     - [Edit Review](#edit-review)
     - [Detail User](#detail-user)
     - [Edit User](#edit-user)
+  - [Pembagian Tugas Milestone 2](#pembagian-tugas-milestone-2)
   - [Pembagian Tugas](#pembagian-tugas)
     - [_Server Side_](#server-side)
     - [_Client Side_](#client-side)
@@ -107,6 +108,14 @@
 
 ![Edit User Page](./screenshots/edit-user.jpg)
 
+## Pembagian Tugas Milestone 2
+
+| Task                   | Assignee           |
+| ---------------------- | ------------------ |
+| Page Request Premium   | 13518110, 13521089 |
+| Endpoint login-premium | 13518110, 13521094 |
+| Endpoint admins        | 13521089           |
+
 ## Pembagian Tugas
 
 1. Login
diff --git a/docker-compose.yml b/docker-compose.yml
index 5534046..db74d34 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     image: tubes-1:latest
     command: --default-authentification-plugin=mysql_native_password
     depends_on:
-      - db
+      - php-db
     ports:
       - 8008:80
     environment:
@@ -17,9 +17,10 @@ services:
       - MYSQL_USER=${nama}
       - MYSQL_PASSWORD=${password}
       - USE_DOCKER_CONFIG=true
+      - DB_HOST=php-db
     volumes:
       - .:/var/www/html/
-  db:
+  php-db:
     env_file:
       - .env
     container_name: tubes-1-database
@@ -33,13 +34,15 @@ services:
       - USE_DOCKER_CONFIG=true
     ports:
       - "9907:3307"
+    volumes:
+      - ./script/init_db.sql:/docker-entrypoint-initdb.d/init_db.sql 
   phpmyadmin:
     container_name: tubes-1-phpmyadmin
     image: phpmyadmin/phpmyadmin
     depends_on:
-      - db
+      - php-db
     environment:
-      PMA_HOST: db
+      PMA_HOST: php-db
     restart: unless-stopped
     ports:
       - "8088:80"
\ No newline at end of file
diff --git a/src/database/DatabaseConnection.php b/src/database/DatabaseConnection.php
index 842776b..5147ecd 100644
--- a/src/database/DatabaseConnection.php
+++ b/src/database/DatabaseConnection.php
@@ -12,7 +12,7 @@ class DatabaseConnection
 
   private function __construct()
   {
-    $DB_HOST = "db";
+    $DB_HOST = $_ENV['DB_HOST'];
     $DB_USERNAME = $_ENV['MYSQL_USER'];
     $DB_PASSWORD = $_ENV['MYSQL_PASSWORD'];
     $DB_NAME = $_ENV['MYSQL_DATABASE'];
-- 
GitLab