Merge branch 'master' into hotfix/docker_8.2

.gitignore

@@ -55,3 +55,4 @@ yarn-error.log
 docker.conf
 
 /documentation_jitsi_admin/node_modules/
+/secretStorage/.Halite*

BranchPipeline.sh

@@ -3,17 +3,17 @@ echo --------------Schutdown Apache------------------------------------------
 echo --------------------------------------------------------------------------
 echo ---------------Git pull--------------------------------------------------
 echo --------------------------------------------------------------------------
-git add .
-git stash
+git reset --hard
 git pull
-
+mv .Halite.key ./secretStorage/.Halite.key
 echo ------------Update parameter.yml and install latest packages-------------
 php composer.phar install
 echo --------------------------------------------------------------------------
 echo ----------------Update Database-------------------------------------------
 echo --------------------------------------------------------------------------
 php bin/console cache:clear
-php bin/console doc:mig:mig -y
+php bin/console doc:mig:mig -n
+php bin/console app:system:repair
 echo --------------------------------------------------------------------------
 echo -----------------Clear Cache----------------------------------------------
 echo --------------------------------------------------------------------------
@@ -41,9 +41,9 @@ echo -----------------------Install NPM and Assets----------------------------
 echo --------------------------------------------------------------------------
 npm install
 npm run build
+rm -r node_modules
 echo --------------------------------------------------------------------------
-echo -----------------Security Check----------------------------------------------
+echo ---------------------Sucessfully installed or updated---------------------
 echo --------------------------------------------------------------------------
-php security-checker.phar security:check composer.lock
 
 

Dockerfile

@@ -19,10 +19,14 @@ RUN rm -rf node_modules/
 #copy all the rest of the app
 COPY . /var/www/html
 #install all php dependencies
-RUN composer install --ignore-platform-req=ext-http
+
+RUN chown -R docker:docker secretStorage
+USER docker
+RUN composer install
+USER root
 #do all the directory stuff
 RUN chmod -R 775 public/build
 RUN mkdir -p var/cache
-RUN chown -R www-data:www-data var
+RUN chown -R docker:docker var
 RUN chmod -R 777 var
 USER docker

composer.json

@@ -52,8 +52,7 @@
     "twig/extra-bundle": "^2.12|^3.0",
     "twig/inky-extra": "^3.0",
     "twig/twig": "^2.0",
-    "vich/uploader-bundle": "^1.13",
-    "ext-http": "*"
+    "vich/uploader-bundle": "^1.13"
   },
   "require-dev": {
     "phpunit/phpunit": "^9.5",