diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..633d2bc17bc4adf726d4c2a993e740302ddd774f Binary files /dev/null and b/.DS_Store differ diff --git a/docker-compose.yaml b/docker-compose.yaml index 2d182f18f2a912b0b09a79375fc47a367bc34fa7..d80b5e2148137f96b238ca651f65d7c34354568a 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,11 @@ version: '3' services: db: image: mysql:8.0 + container_name: db + volumes: + - dbdata:/var/lib/mysql command: --default-authentication-plugin=mysql_native_password + restart: always environment: MYSQL_ROOT_PASSWORD: advancedroot MYSQL_DATABASE: userdb @@ -11,6 +15,8 @@ services: MYSQL_PASSWORD: service_user ports: - "9906:3306" + expose: + - "9906" web: image: php:7.2.2-apache container_name: php_web @@ -22,3 +28,6 @@ services: - "8000:80" stdin_open: true tty: true + +volumes: + dbdata: \ No newline at end of file diff --git a/php/config.php b/php/config.php index 91b79912f6f084fa57e671e396f32cc61fa8f7b0..8711b0c3264d183a80a00949c6d5497cae522bb2 100644 --- a/php/config.php +++ b/php/config.php @@ -1,7 +1,6 @@ <?php //Database credentials define('DB_SERVER', 'db'); -define('DB_PORT', 9906); define('DB_USERNAME', 'service_user'); define('DB_PASSWORD', 'service_user'); define('DB_NAME', 'userdb');