Some docker fixes, fix bad composer config merge

alma · Jun 4, 2024 · bc6e78d · bc6e78d
1 parent 7b0073b
commit bc6e78d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -57,7 +57,7 @@ jobs:
         run: composer validate
 
       - name: Install dependencies
-        run: composer install --prefer-dist --no-progress --no-suggest
+        run: composer install --prefer-dist --no-progress
 
       - name: Prepare unittests configuration
         run: sed -i 's/{MYVERSION}/${{ matrix.php.unittest-version }}/g' phpunit.ci.xml

diff --git a/Dockerfile b/Dockerfile
@@ -18,7 +18,7 @@ RUN apt update && \
 RUN usermod -u 1000 www-data
 RUN groupmod -g 1000 www-data
 
-RUN mkdir -p /app && chown -R www-data:www-data /app
+RUN mkdir -p /app/vendor && chown -R www-data:www-data /app
 
 USER www-data
 WORKDIR /app
@@ -27,4 +27,4 @@ COPY --link .docker/php.ini /usr/local/etc/php/php.ini
 
 COPY --from=composer /usr/bin/composer /usr/bin/composer
 COPY --link composer.json ./
-RUN composer install --prefer-dist --no-progress --no-suggest
+RUN composer install --prefer-dist --no-progress
diff --git a/composer.json b/composer.json
@@ -39,9 +39,7 @@
   "config": {
     "allow-plugins": {
       "dealerdirect/phpcodesniffer-composer-installer": true
-    }
-  },
-  "config": {
+    },
     "lock": false
   }
 }