From 1b136bbf51bb4efafd3e7de257871cdce78364ba Mon Sep 17 00:00:00 2001
From: AlphaThrone <haikalardzi@gmail.com>
Date: Fri, 10 Nov 2023 20:50:19 +0700
Subject: [PATCH] refactor: changes to integrate db in docker
---
Dockerfile | 3 ---
docker-compose.yml | 24 +++---------------------
server/controllers/connect_database.php | 2 +-
3 files changed, 4 insertions(+), 25 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ec1c203..6a46a0d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,9 +6,6 @@ WORKDIR /var/www/html
# Copy the current directory contents into the container at /var/www/html
COPY . /var/www/html
-# Install mysqli dependency
-RUN docker-php-ext-install mysqli && docker-php-ext-enable mysqli
-
# Expose port 80 for the web server
EXPOSE 80
diff --git a/docker-compose.yml b/docker-compose.yml
index 6f441f2..a3823ea 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,27 +2,9 @@ version: '3.3'
services:
saranghaengbok:
build: .
- image: tubes-1:latest
+ container_name: php_app
ports:
- 8008:80
environment:
- DB_HOST: db
- db:
- image: mysql:latest
- ports:
- - 6603:3306
- volumes:
- - db_data:/var/lib/mysql
- environment:
- MYSQL_ROOT_PASSWORD: admin
- phpmyadmin:
- image: phpmyadmin:latest
- restart: always
- ports:
- - 8080:80
- environment:
- - PMA_ARBITRARY=1
- - PMA_PORT=3306
- - PMA_HOST=db
-volumes:
- db_data:
+ DB_URL: mysql://db/saranghaengbok_php
+
diff --git a/server/controllers/connect_database.php b/server/controllers/connect_database.php
index d463109..7a7f49b 100644
--- a/server/controllers/connect_database.php
+++ b/server/controllers/connect_database.php
@@ -1,7 +1,7 @@
<?php
function connect_database(){
// Create a connection
- $conn = new mysqli('db', 'saranghaengbok_db_admin', 'BOOMbitchgetouttheway', 'saranghaengbok_db');
+ $conn = new mysqli('db-php-app', 'saranghaengbok_db_admin', 'BOOMbitchgetouttheway', 'saranghaengbok_php');
// Check connection
if ($conn->connect_error) {
--
GitLab