Merge pull request #981 from dbarzin/dev

Dev

Dockerfile

@@ -58,10 +58,7 @@ RUN chown -R mercator:www /var/www/mercator
 USER mercator:www
 
 # Run composer
-RUN composer -n update
-
-# Publish Laravel Vendor resources
-RUN php artisan vendor:publish --all
+RUN composer install
 
 # Create database folder
 RUN mkdir sql

INSTALL.RedHat.fr.md

@@ -17,14 +17,14 @@ Installer Httpd, GIT, Graphviz, Vim et Php
 
 	sudo dnf install vim httpd git graphviz php
 
-Vérifier que le module php 8.1 est disponible
+Vérifier que le module php 8.2 est disponible
 
 	sudo dnf module list php
 
 Installer php 8.1
 
 	sudo dnf module reset php
-	sudo dnf module enable php:8.1
+	sudo dnf module enable php:8.2
 	sudo dnf install php
 
 Vérifier la version php
@@ -59,18 +59,9 @@ Cloner le projet depuis Github
 
 ## Composer
 
-Mettre à jour composer
-
-	cd /var/www/mercator
-	composer self-update
-
 Installer les packages avec composer
 
-	composer update
-
-Publier tous les actifs publiables à partir des packages des fournisseurs
-
-	php artisan vendor:publish --all
+	composer install
 
 ## MySQL
 
@@ -140,10 +131,6 @@ Pour importer la base de données de test (facultatif)
 
 	sudo mysql mercator < mercator_data.sql
 
-ou (Postgres):
-
-    psql mercator < pg_mercator_data.sql
-
 ## Importer la base de données des CPE
 
 Décompresse la base de données

INSTALL.RedHat.md

@@ -17,14 +17,14 @@ Install Httpd, GIT, Graphviz, Vim and Php
 
     sudo dnf install vim httpd git graphviz php
 
-Check that the php 8.1 module is available
+Check that the php 8.2 module is available
 
     sudo dnf module list php
 
-Install php 8.1
+Install php 8.2
 
     sudo dnf module reset php
-    sudo dnf module enable php:8.1
+    sudo dnf module enable php:8.2
     sudo dnf install php
 
 Check php version
@@ -42,7 +42,7 @@ Install Composer
 
 Verify that Composer is installed
 
-    compose --version
+    composer --version
 
 ##Project
 
@@ -58,18 +58,9 @@ Clone the project from Github
 
 ## Compose
 
-Update composer
-
-    cd /var/www/mercator
-    compose self-update
-
 Install packages with composer
 
-    composer update
-
-Publish all publishable assets from vendor packages
-
-    php artisan vendor:publish --all
+    composer install
 
 ## MySQL
 
@@ -139,10 +130,6 @@ To import the test database (optional)
 
     sudo mysql mercator < mercator_data.sql
 
-or (Postgres):
-
-     psql mercator < pg_mercator_data.sql
-
 ## Import the CPE database
 
 Unpack the database

INSTALL.md

@@ -2,7 +2,7 @@
 
 ## Recommended configuration
 
-- OS : Ubuntu 22.04 LTS - Server - Small user footprint
+- OS : Ubuntu 24.04 LTS - Server - Small user footprint
 - RAM : 2G
 - Disk : 10G
 - VCPU 2
@@ -38,22 +38,14 @@ Clone the project from Github
 Install packages with composer :
 
     cd /var/www/mercator
-    composer update
-
-Publish all publishable assets from vendor packages
-
-    php artisan vendor:publish --all
+    composer install
 
 ## MySQL
 
 Install MySQL
 
     sudo apt install mysql-server
 
-Make sure you are using MySQL
-
-    sudo mysql --version
-
 Launch MySQL with root rights
 
     sudo mysql
@@ -110,10 +102,6 @@ To import the test database (optional)
 
     sudo mysql mercator < mercator_data.sql
 
-or (Postgres)
-
-   psql mercator < pg_mercator_data.sql
-
 ## Import the CPE Database
 
 Decompress CPE databse
@@ -315,10 +303,6 @@ Before updating the application take a backup of the database and the project.
 
     mysqldump mercator > mercator_backup.sql
 
-or (Postgres)
-
-    pg_dump mercator > mercator_backup.sql
-
 Get the sources from GIT
 
     cd /var/www/mercator