refactor: reposition php code in the folder (#25)

refactor: rename login/ -> php/\n\ncalling the folder php is more representative of what there is inside refactor: move files from public folder to private refactor: move Dockerfile in their own folder
museebolo · Jun 10, 2024 · 3148fca · 3148fca
1 parent a5214ed
commit 3148fca
Show file tree

Hide file tree

Showing 14 changed files with 25 additions and 20 deletions.
diff --git a/Dockerfile.Php b/Dockerfile.Php
diff --git a/Dockerfile.Nginx → Dockerfile/Dockerfile.Nginx b/Dockerfile.Nginx → Dockerfile/Dockerfile.Nginx
@@ -1,19 +1,19 @@
 # node 20, build the application
 FROM node:20.12.2-alpine3.19
-COPY Interface .
+COPY ../Interface .
 RUN npm install
 RUN npm run build
 
 
 # nginx 1.26 on port 80, keep the build output, nginx config
 FROM nginx:1.26-alpine-otel
 EXPOSE 80
-COPY --from=0 ./dist /var/www/memoires-info/html
-COPY .env /var/www/memoires-info/html/.env
+COPY --from=0 ../dist /var/www/memoires-info/html
+COPY ../.env /var/www/memoires-info/html/.env
 
 # copy the nginx config
-COPY ./nginx.conf /etc/nginx/conf.d/default.conf
+COPY ../nginx.conf /etc/nginx/conf.d/default.conf
 RUN sed -i '/location \/adminer\//,/}/d' /etc/nginx/conf.d/default.conf
 # copy php files for ngnix to know they exist
-COPY login/public /var/www/memoires-info/php/public
+COPY ../php/public /var/www/memoires-info/php/public
 
diff --git a/Dockerfile/Dockerfile.Php b/Dockerfile/Dockerfile.Php
@@ -0,0 +1,13 @@
+# php 8.3 with the files, install dependencies
+FROM composer:2.7
+COPY ../php .
+RUN composer install
+
+# copy required files to new image
+FROM php:8.3-fpm-alpine
+COPY ../php/public /var/www/memoires-info/php/public
+COPY ../php/private /var/www/memoires-info/php/private
+COPY ../php/lib.php /var/www/memoires-info/php
+COPY ../.env /var/www/memoires-info/php/
+COPY --from=0 ../app/vendor /var/www/memoires-info/php/vendor
+
diff --git a/Dockerfile.Sqitch → Dockerfile/Dockerfile.Sqitch b/Dockerfile.Sqitch → Dockerfile/Dockerfile.Sqitch
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
@@ -28,7 +28,7 @@ services:
   migration:
     build:
       context: .
-      dockerfile: Dockerfile.Sqitch
+      dockerfile: Dockerfile/Dockerfile.Sqitch
     image: sqitch-memoires-info
     environment:
       SQITCH_TARGET: "db:pg://postgres:${POSTGRES_PASSWORD}@db:5432/memoires-info"
@@ -53,15 +53,15 @@ services:
   php:
     build:
       context: .
-      dockerfile: Dockerfile.Php
+      dockerfile: Dockerfile/Dockerfile.Php
     image: php-memoires-info
     depends_on:
       - postg-rest
 
   web:
     build:
       context: .
-      dockerfile: Dockerfile.Nginx
+      dockerfile: Dockerfile/Dockerfile.Nginx
     image: nginx-memoires-info
     ports:
       - '80:80'

diff --git a/login/.gitignore → php/.gitignore b/login/.gitignore → php/.gitignore
diff --git a/login/composer.json → php/composer.json b/login/composer.json → php/composer.json
diff --git a/login/composer.lock → php/composer.lock b/login/composer.lock → php/composer.lock
diff --git a/login/lib.php → php/lib.php b/login/lib.php → php/lib.php
diff --git a/login/login.http → php/login.http b/login/login.http → php/login.http
diff --git a/login/public/esp.php → php/private/esp.php b/login/public/esp.php → php/private/esp.php
diff --git a/login/public/login.php → php/private/login.php b/login/public/login.php → php/private/login.php
diff --git a/php/public/esp.php b/php/public/esp.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../private/esp.php';
diff --git a/php/public/login.php b/php/public/login.php
@@ -0,0 +1,2 @@
+<?php
+require_once __DIR__ . '/../private/login.php';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?php
		require_once __DIR__ . '/../private/esp.php';
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		<?php
		require_once __DIR__ . '/../private/login.php';