diff --git a/database/trials.sql b/database/trials.sql index c304904..f3fb37b 100644 --- a/database/trials.sql +++ b/database/trials.sql @@ -49,11 +49,11 @@ CREATE TABLE IF NOT EXISTS `trials` ( `cookies` varchar(5) DEFAULT NULL, `platform` varchar(30) NOT NULL, `appCodeName` varchar(30) NOT NULL, - `appVersion` varchar(15) DEFAULT NULL, + `appVersion` text DEFAULT NULL, `product` varchar(30) NOT NULL, `browser` varchar(20) DEFAULT NULL, `webgl` varchar(4) DEFAULT NULL, - `timeDate` varchar(40) NOT NULL, + `timeDate` text NOT NULL, `timeWelcome` bigint(20) DEFAULT NULL, `timeStart` bigint(20) DEFAULT NULL, `timeEnd` bigint(20) DEFAULT NULL, diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..1c47d26 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,35 @@ +version: '3' + +services: + + # database + database: + image: mysql:latest + restart: always + volumes: + - ./database/trials.sql:/docker-entrypoint-initdb.d/trials.sql + environment: + MYSQL_DATABASE: facemaker + MYSQL_ALLOW_EMPTY_PASSWORD: 'true' + + # phpmyadmin + phpmyadmin: + depends_on: + - database + image: phpmyadmin/phpmyadmin:latest + restart: always + ports: + - '8000:80' + environment: + PMA_HOST: database + + # webserver + web: + depends_on: + - database + build: ./web + restart: always + ports: + - '8080:80' + volumes: + - ./web:/var/www/html/ \ No newline at end of file diff --git a/web/Dockerfile b/web/Dockerfile new file mode 100644 index 0000000..5be11e0 --- /dev/null +++ b/web/Dockerfile @@ -0,0 +1,3 @@ +FROM php:apache + +RUN docker-php-ext-install mysqli \ No newline at end of file diff --git a/web/php/config.php b/web/php/config.php index 667648f..9c3d4bf 100644 --- a/web/php/config.php +++ b/web/php/config.php @@ -7,7 +7,7 @@ or die ("Connection could be established"); //echo "choosing local db

"; } else { - $connection = mysqli_connect("HOSTNAME", "USERNAME", "PASSWORD", "DATABASENAME") + $connection = mysqli_connect("database", "root", "", "facemaker") or die ("Connection could be established"); //echo "choosing online db

"; }