PUSH

-> For god sake i hate
MythicalLTD · Aug 23, 2024 · ba8a6d6 · ba8a6d6
1 parent 03d6967
commit ba8a6d6
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 17 deletions.
diff --git a/app/Web/Installer/Installer.php b/app/Web/Installer/Installer.php
@@ -17,15 +17,15 @@ public static function Installed(\Router\Router $router): void
          */
         if (file_exists(__DIR__ . '/../../../storage/FIRST_INSTALL')) {
             $router->add('/', function () {
-                include __DIR__ . '/../app/Web/Installer/index.php';
+                include __DIR__ . '/index.php';
             });
 
             $router->add('/mysql', function () {
-                include __DIR__ . '/../app/Web/Installer/mysql.php';
+                include __DIR__ . '/ mysql.php';
             });
 
             $router->add('/install', function () {
-                include __DIR__ . '/../app/Web/Installer/install.php';
+                include __DIR__ . '/ install.php';
             });
 
             $router->add('/(.*)', function () {

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
@@ -41,6 +41,7 @@ services:
       context: ../
       dockerfile: docker/php/Dockerfile
     container_name: mythicalframework_php
+    command: php-fpm -R
     volumes:
       - "app:/var/www/html"
     networks:

diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile
@@ -3,6 +3,8 @@ FROM php:8.3-fpm-bookworm
 RUN apt-get update \
     && apt-get install -y build-essential zlib1g-dev default-mysql-client curl gnupg procps vim git unzip libzip-dev libpq-dev libicu-dev libonig-dev libpng-dev libjpeg-dev libfreetype6-dev
 
+RUN apt-get install nano -y
+
 RUN apt-get update && apt-get install -y \
     libfreetype6-dev \
     libjpeg62-turbo-dev \
@@ -52,25 +54,18 @@ ADD ./docker/php/www.conf /usr/local/etc/php-fpm.d/
 RUN apt update && apt upgrade -y && apt install -y git
 RUN git clone https://github.com/MythicalLTD/Framework.git /var/www/html
 
-RUN addgroup --gid 1000 mythicalframework && adduser --ingroup mythicalframework --uid 1000 --shell /bin/sh --disabled-password --gecos "" mythicalframework
-RUN chown mythicalframework:mythicalframework /var/www/html
+#RUN addgroup --gid 1000 mythicalframework && adduser --ingroup mythicalframework --uid 1000 --shell /bin/sh --disabled-password --gecos "" mythicalframework
+#RUN chown mythicalframework:mythicalframework /var/www/html
 
 WORKDIR /var/www/html
 
 COPY --from=composer:latest /usr/bin/composer /usr/bin/composer
 RUN composer install --no-dev --optimize-autoloader --no-interaction --no-progress --no-suggest
 
-
-RUN php framework configure
-
-RUN php framework migrate
-
-RUN chmod -R 777 /var/www/html/
-
+#RUN php framework configure
+#RUN php framework migrate
 
 # THIS IS LAST
 
-#USER mythicalframework
-
-
+USER root
 
diff --git a/docker/php/www.conf b/docker/php/www.conf
@@ -20,8 +20,8 @@
 ; Unix user/group of processes
 ; Note: The user is mandatory. If the group is not set, the default user's group
 ;       will be used.
-user = mythicalframework
-group = mythicalframework
+user = root
+group = root
 
 ; The address on which to accept FastCGI requests.
 ; Valid syntaxes are: