docker files & adjustments of entry files

.gitignore

@@ -1,4 +1,3 @@
-/nbproject/private/
 /cache/
 /log/
 config.php

.gitmodules

@@ -1,9 +1,9 @@
 [submodule "lib/system"]
 	path = lib/system
-	url = git@github.com:webcraftmedia/system.git
+	url = ../../webcraftmedia/system.git
 [submodule "wecker_manufaktur/sai/saimod_mail"]
 	path = wecker_manufaktur/sai/saimod_mail
-	url = git@github.com:webcraftmedia/saimod_mail.git
+	url = ../../webcraftmedia/saimod_mail.git
 [submodule "lib/mail_cannon"]
 	path = lib/mail_cannon
-	url = git@github.com:webcraftmedia/lib_mail_cannon.git
+	url = ../../webcraftmedia/lib_mail_cannon.git

.htaccess

@@ -1,7 +1,7 @@
 RewriteEngine On
 
-RewriteRule ^(.*)fonts/fontawesome-webfont(.*)$ lib/system/lib/font_awesome/lib/fonts/fontawesome-webfont$2 [L]
-RewriteRule ^sai$ sai.php$1 [L]
+#RewriteRule ^(.*)fonts/fontawesome-webfont(.*)$ lib/system/lib/font_awesome/lib/fonts/fontawesome-webfont$2 [L]
+#RewriteRule ^sai$ sai.php$1 [L]
 
 RewriteRule ^(.*)files/([^/]+)/([^/]+)$ api.php?call=files&cat=$2&id=$3 [L]
 RewriteRule ^cache/([^/]+)/([^/]+)$ api.php?call=cache&id=$1&ident=$2 [L]

api.php

@@ -1,5 +1,5 @@
 <?php
-require_once 'autoload.inc';
+require_once 'index.inc';
 
 echo \SYSTEM\API\api::run(\SYSTEM\API\verify::class,api_wecker_manufaktur::class,array_merge($_POST,$_GET));
-new \SYSTEM\LOG\COUNTER("API was called sucessfully.");
+new \SYSTEM\LOG\COUNTER("API was called successfully.");

docker-compose.yml

@@ -0,0 +1,39 @@
+version: "3.4"
+
+services:
+  mariadb:
+    build:
+      context: ./docker
+      dockerfile: ./Dockerfile.mariadb
+    environment:
+      #- MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1
+      - MARIADB_ROOT_PASSWORD=SECRET
+      - MARIADB_USER=web
+    ports:
+      - 3306:3306
+    volumes:
+      - db_vol:/var/lib/mysql
+
+  php:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.php
+    volumes:
+      - ./:/app
+    user: "1000"
+
+  nginx:
+    build:
+      context: .
+      dockerfile: ./docker/Dockerfile.nginx
+    depends_on:
+      - php
+      - mariadb
+    ports:
+      - 80:80
+    volumes:
+      - ./nginx/log:/var/log/nginx
+      - ./:/app
+
+volumes:
+  db_vol:

docker/Dockerfile.mariadb

@@ -0,0 +1 @@
+FROM mariadb:latest

docker/Dockerfile.nginx

@@ -0,0 +1,3 @@
+FROM nginx:latest
+
+COPY ../nginx/default.conf /etc/nginx/conf.d/default.conf

docker/Dockerfile.php

@@ -0,0 +1,5 @@
+FROM php:8.2-fpm-alpine
+
+# RUN docker-php-ext-install pdo pdo_mysql mbstring
+# RUN apk add sqlite
+RUN docker-php-ext-install session mysqli

index.php

@@ -1,5 +1,5 @@
 <?php
-include 'autoload.inc';
+include 'index.inc';
 
-echo \SYSTEM\API\api::run('\SYSTEM\API\verify', page_wecker_manufaktur::class, array_merge($_POST,$_GET), 1, false, true);
-new \SYSTEM\LOG\COUNTER("Page was called sucessfully.");
+echo \SYSTEM\API\api::run(\SYSTEM\API\verify::class, page_wecker_manufaktur::class, array_merge($_POST,$_GET), 1, false, true);
+new \SYSTEM\LOG\COUNTER("Page was called successfully.");

lib/system

@@ -1 +1 @@
-Subproject commit 995104aaaf19be91f59031307844b6a3c7ceea06
+Subproject commit 75cdde9b02360f1082ed02fa58f656853b44cd61

nginx/default.conf

@@ -0,0 +1,26 @@
+server {
+    listen 80 default_server;
+    listen [::]:80 default_server;
+
+    root /app;
+    index index.php;
+
+    rewrite ^(.*)/webfonts/(.*)$ /lib/system/lib/font_awesome/lib/webfonts/$2;
+    rewrite ^sai$ /sai.php$1;
+    rewrite ^(.*)/files/([^/]+)/([^/]+)$ /api.php?call=files&cat=$2&id=$3;
+    rewrite ^/cache/([^/]+)/([^/]+)$ /api.php?call=cache&id=$1&ident=$2;
+
+    location / {
+		try_files $uri $uri/ =404;
+
+        location ~ \.php$ {
+            fastcgi_split_path_info ^(.+\.php)(/.+)$;
+            fastcgi_pass php:9000;
+            fastcgi_index index.php;
+            include fastcgi_params;
+            fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+            fastcgi_param SCRIPT_NAME $fastcgi_script_name;
+            fastcgi_param PATH_INFO $fastcgi_path_info;
+        }
+	}
+}

nginx/log/.gitignore

@@ -0,0 +1,2 @@
+*
+!.gitignore

sai.php

@@ -1,4 +1,4 @@
 <?php
-include 'autoload.inc';
+include 'index.inc';
 
 echo (new \SYSTEM\SAI\sai_gui())->html();