Merge pull request #4 from Apes-HDF/chore/sync-les-tilleuls
Chore/sync les tilleuls
This commit is contained in:
commit
142a136a4b
4 changed files with 17 additions and 8 deletions
2
.env
2
.env
|
|
@ -78,7 +78,7 @@ SMS_DSN=null://null
|
||||||
###< symfony/notifier ###
|
###< symfony/notifier ###
|
||||||
|
|
||||||
###> symfony/fake-sms-notifier ###
|
###> symfony/fake-sms-notifier ###
|
||||||
FAKE_SMS_DSN=fakesms+email://mailer?to=admin&from=PlateformCoop
|
FAKE_SMS_DSN=fakesms+email://mailer?to=admin&from=plateforme
|
||||||
###< symfony/fake-sms-notifier ###
|
###< symfony/fake-sms-notifier ###
|
||||||
|
|
||||||
###> snc/redis-bundle ###
|
###> snc/redis-bundle ###
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@ This documention gives solutions for some errors occuring in the project.
|
||||||
|
|
||||||
### Error 1.1
|
### Error 1.1
|
||||||
|
|
||||||
plateformcoop-ebs$ docker compose exec php ./vendor/bin/php-cs-fixer fix --allow-risky=yes
|
plateforme-ebs$ docker compose exec php ./vendor/bin/php-cs-fixer fix --allow-risky=yes
|
||||||
OCI runtime exec failed: exec failed: unable to start container process: exec: "./vendor/bin/php-cs-fixer": permission denied: unknown
|
OCI runtime exec failed: exec failed: unable to start container process: exec: "./vendor/bin/php-cs-fixer": permission denied: unknown
|
||||||
|
|
||||||
### Solution 1.1
|
### Solution 1.1
|
||||||
|
|
|
||||||
|
|
@ -75,3 +75,12 @@ Run the tests and generate the code coverage report:
|
||||||
Run all checks like the Github CI:
|
Run all checks like the Github CI:
|
||||||
|
|
||||||
make ci
|
make ci
|
||||||
|
|
||||||
|
### Import a commit into customers repo
|
||||||
|
|
||||||
|
1. go to customer repo tree
|
||||||
|
2. add les tilleuls repo as a remote : `git remote add source git@github.com:coopTilleuls/plateformcoop-ebs.git`
|
||||||
|
3. change to sync branch : `git checkout chore/sync-les-tilleuls`
|
||||||
|
4. update the branch by merging main : `git merge main`
|
||||||
|
5. update source remote : `git fetch source`
|
||||||
|
6. cherry-pick the commits you want : `git cherry-pick <commit ref>`
|
||||||
|
|
|
||||||
|
|
@ -105,7 +105,7 @@ Which gives:
|
||||||
|
|
||||||
Install the project dependencies:
|
Install the project dependencies:
|
||||||
|
|
||||||
cd /var/www/plateformcoop-ebs
|
cd /var/www/plateforme-ebs
|
||||||
composer install --ignore-platform-req=php
|
composer install --ignore-platform-req=php
|
||||||
|
|
||||||
The `--ignore-platform-` options is required if you have a PHP version below `8.1.11`.
|
The `--ignore-platform-` options is required if you have a PHP version below `8.1.11`.
|
||||||
|
|
@ -161,12 +161,12 @@ And put:
|
||||||
|
|
||||||
<VirtualHost *:80>
|
<VirtualHost *:80>
|
||||||
ServerAdmin admin@example.com
|
ServerAdmin admin@example.com
|
||||||
DocumentRoot /var/www/plateformcoop-ebs/public
|
DocumentRoot /var/www/plateforme-ebs/public
|
||||||
|
|
||||||
ErrorLog ${APACHE_LOG_DIR}/error.log
|
ErrorLog ${APACHE_LOG_DIR}/error.log
|
||||||
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
CustomLog ${APACHE_LOG_DIR}/access.log combined
|
||||||
|
|
||||||
<Directory /var/www/plateformcoop-ebs/public>
|
<Directory /var/www/plateforme-ebs/public>
|
||||||
AllowOverride All
|
AllowOverride All
|
||||||
Require all granted
|
Require all granted
|
||||||
FallbackResource /index.php
|
FallbackResource /index.php
|
||||||
|
|
@ -198,7 +198,7 @@ Close and reopen the session so nvm is available:
|
||||||
|
|
||||||
Then run:
|
Then run:
|
||||||
|
|
||||||
cd /var/www/plateformcoop-ebs
|
cd /var/www/plateforme-ebs
|
||||||
yarn install
|
yarn install
|
||||||
yarn build
|
yarn build
|
||||||
|
|
||||||
|
|
@ -209,8 +209,8 @@ Be careful that is you run the commands as root some files may not have the corr
|
||||||
rights.
|
rights.
|
||||||
The following directory should be owned by the web server user:
|
The following directory should be owned by the web server user:
|
||||||
|
|
||||||
chown -R /var/www/plateformcoop-ebs/public
|
chown -R /var/www/plateforme-ebs/public
|
||||||
chown -R /var/www/plateformcoop-ebs/var
|
chown -R /var/www/plateforme-ebs/var
|
||||||
|
|
||||||
|
|
||||||
## Parameters
|
## Parameters
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue