Merge branch 'levi' into 'master'

Levi

See merge request photowall/photowall-docker!2

Dockerfile

@@ -22,6 +22,7 @@ COPY ./wwwdata/*.css /var/www/html/
 COPY ./wwwdata/media /var/www/html/media/
 COPY ./php.ini /etc/php/7.4/apache2/
 COPY ./config/apache2 /etc/apache2
+COPY ./database_init.php /database_init.php
 
 # let through ports for webserver and xdebug access
 EXPOSE 80

database_init.php

@@ -0,0 +1,54 @@
+<?php
+include_once "globals.php";
+
+// csatlakozás az adatbázis szervezhez,
+// a konkrét adatbázist még nem adjuk meg, mert lehet még nem létezik
+$dbconn = mysqli_connect(SQL_IP, SQL_USER, SQL_PASS);
+
+$create_database_query = 'CREATE DATABASE IF NOT EXISTS ' . SQL_DB . ';';
+$use_database_query = 'USE ' . SQL_DB . ';';
+if (mysqli_query($dbconn, $create_database_query) && mysqli_query($dbconn, $use_database_query)) {
+    echo "Adatbázis létrehozva." . PHP_EOL;
+} else {
+    echo "Hiba az adatbázis létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
+}
+
+$create_tables_queries = "
+/*DROP TABLE IF EXISTS `publish_table`;/**/
+CREATE TABLE IF NOT EXISTS `publish_table` (
+  `No` int NOT NULL AUTO_INCREMENT,
+  `Author` varchar(45) NOT NULL,
+  `Title` varchar(45) NOT NULL,
+  `Description` text,
+  `Image_FileName` varchar(45) NOT NULL,
+  `AspectRatio` float NOT NULL DEFAULT '1',
+  `ColorMean` varchar(32) NOT NULL DEFAULT 'cadetblue',
+  `Approved` tinyint NOT NULL DEFAULT '1',
+  `UID` varchar(32) NOT NULL,
+  `TS` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`No`),
+  UNIQUE KEY `UID_UNIQUE` (`UID`)
+) /*ENGINE=InnoDB CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci*/ ;
+
+/*DROP TABLE IF EXISTS `server_access`;/**/
+CREATE TABLE IF NOT EXISTS `server_access` (
+  `No` INT NOT NULL AUTO_INCREMENT,
+  `IP` VARCHAR(45) NOT NULL,
+  `Image_FileName` VARCHAR(45) NULL,
+  `Timestamp` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  PRIMARY KEY (`No`)
+);
+";
+mysqli_multi_query($dbconn, $create_tables_queries);
+
+// flush results
+while (mysqli_more_results($dbconn) && mysqli_next_result($dbconn)) {;}
+
+// check errors
+if (mysqli_errno($dbconn)) {
+    echo "Hiba a táblák létrehozása során: " . mysqli_error($dbconn) . PHP_EOL;
+} else {
+    echo "Táblák létrehozva." . PHP_EOL;
+}
+
+mysqli_close($dbconn);

entrypoint.sh

@@ -13,13 +13,15 @@ mkdir -p ARTWORKS/published
 # change owner to www-data
 chown -R www-data:www-data ARTWORKS
 
+# initialize database
+cat /database_init.php | php -d display_errors=on -d error_reporting=-1
+
 # substitute server name
 sed -i "s|ServerName|ServerName ${PHW_SERVER_NAME}|g" /etc/apache2/sites-available/000-default.conf
 
 # remove index.html
 rm /var/www/html/index.html
 
-
 # start webserver
 /usr/sbin/apache2ctl -D FOREGROUND