fix #5780 @0:20

diff --git a/composer.lock b/composer.lock
index 8b83ea65fb8622f6fc08979d7700b38af6bc4c9a..abd32b0b0c4cfab1b125f03c619448ccc63185dd 100644 (file)
--- a/composer.lock
+++ b/composer.lock
@@ -1505,13 +1505,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubedesigners_userdatabase.git",
-                "reference": "88d28b5404ec572ffc86a0dd75ec5a3032e8e2c5"
+                "reference": "de3c655c9aa77497f2f33e7e80a8e98b2eb84899"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack4.1-3fb7ba.tar",
-                "reference": "88d28b5404ec572ffc86a0dd75ec5a3032e8e2c5",
-                "shasum": "c1af6bf6510808e5c828b41117e72f9468d1520c"
+                "url": "https://composer.cubedesigners.com/dist/cubedesigners/userdatabase/cubedesigners-userdatabase-dev-backpack4.1-97755b.tar",
+                "reference": "de3c655c9aa77497f2f33e7e80a8e98b2eb84899",
+                "shasum": "ffd64cccf8471c59b7c834526920f9fbd39436fc"
             },
             "require": {
                 "cubist/cms-back": "dev-backpack4.1"
@@ -1542,7 +1542,7 @@
                 }
             ],
             "description": "Cubedesigners common users database",
-            "time": "2023-04-21T17:20:51+00:00"
+            "time": "2023-04-24T12:30:51+00:00"
         },
         {
             "name": "cubist/azuretts",
@@ -1592,13 +1592,13 @@
             "source": {
                 "type": "git",
                 "url": "git://git.cubedesigners.com/cubist_cms-back.git",
-                "reference": "90d68ed3bc35678976a4a4ac574877e19c05258b"
+                "reference": "6b606cc6766eefc533eac3f45850ecedcca6fc1a"
             },
             "dist": {
                 "type": "tar",
-                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack4.1-8c7d8b.tar",
-                "reference": "90d68ed3bc35678976a4a4ac574877e19c05258b",
-                "shasum": "b59d295418677f2094ffded3c448b110e1c44932"
+                "url": "https://composer.cubedesigners.com/dist/cubist/cms-back/cubist-cms-back-dev-backpack4.1-1c0ce3.tar",
+                "reference": "6b606cc6766eefc533eac3f45850ecedcca6fc1a",
+                "shasum": "04a814985dce5895b9eae514c9f38a526378d827"
             },
             "require": {
                 "backpack/backupmanager": "^3.0",
@@ -1678,7 +1678,7 @@
                 }
             ],
             "description": "Cubist Backpack extension",
-            "time": "2023-04-21T17:20:33+00:00"
+            "time": "2023-04-24T12:31:49+00:00"
         },
         {
             "name": "cubist/cms-front",
@@ -14587,16 +14587,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "1.20.0",
+            "version": "1.20.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "10553ab3f0337ff1a71433c3417d7eb2a3eec1fd"
+                "reference": "90490bd8fd8530a272043c4950c180b6d0cf5f81"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/10553ab3f0337ff1a71433c3417d7eb2a3eec1fd",
-                "reference": "10553ab3f0337ff1a71433c3417d7eb2a3eec1fd",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/90490bd8fd8530a272043c4950c180b6d0cf5f81",
+                "reference": "90490bd8fd8530a272043c4950c180b6d0cf5f81",
                 "shasum": ""
             },
             "require": {
@@ -14626,9 +14626,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.0"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/1.20.2"
             },
-            "time": "2023-04-20T11:18:07+00:00"
+            "time": "2023-04-22T12:59:35+00:00"
         },
         {
             "name": "phpunit/php-code-coverage",

diff --git a/resources/tools/dockerwebcontainer/php b/resources/tools/dockerwebcontainer/php
index 73757cba6b9e19e2ad26d4ce40474c7149377359..d72b0ec0f9eae4c852d5bc012dade07c793e112a 100644 (file)
--- a/resources/tools/dockerwebcontainer/php
+++ b/resources/tools/dockerwebcontainer/php
@@ -15,8 +15,7 @@
             - './config/composer/:/root/.config/composer/'
             - './config/composer/:/application/.config/composer/'
             # Sudoers
-            - './config/sudoers:/etc/sudoers.d/toolbox'
-            - './images/$phpfpmimage/php-ini-overrides.ini:/etc/php/$phpversion/fpm/conf.d/99-overrides.ini'
+            - './config/sudoers:/etc/sudoers.d/$name'
             # ImageMagick
             - './config/imagemagick/policy.xml:/etc/ImageMagick-6/policy.xml'
             # Passwords

diff --git a/resources/tools/dockerwebcontainer/template/config/sudoers b/resources/tools/dockerwebcontainer/template/config/sudoers
index d7663ef75ed63615c9a7faf6e5026ebdfc99b090..35c101818e41dc774944819a90e022c9dcaa1edf 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/config/sudoers
+++ b/resources/tools/dockerwebcontainer/template/config/sudoers
@@ -1 +1 @@
-toolbox ALL=(ALL) NOPASSWD:ALL
+$name ALL=(ALL) NOPASSWD:ALL

diff --git a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
index f7102e19e663dbe943bab4cb13c9811e0e783360..706b929dfb8b335f89d4261537b4f807c85fb9e6 100644 (file)
--- a/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
+++ b/resources/tools/dockerwebcontainer/template/images/php-fpm/Dockerfile
@@ -14,18 +14,14 @@ ENV DEBIAN_FRONTEND=noninteractive
 
 # Add Ondrej PHP repository
 RUN apt update \
-    && apt install -y --no-install-recommends gnupg \
+    && apt install -y --no-install-recommends gnupg bash curl \
     && echo "deb http://ppa.launchpad.net/ondrej/php/ubuntu jammy main" > /etc/apt/sources.list.d/ondrej-php.list \
     && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 4F4EA0AAE5267A6C
 
-# Install nodejs repository
-RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -
-
 RUN apt update
 
 RUN apt -y --no-install-recommends install \
         ca-certificates \
-        curl \
         unzip \
         git \
         php$phpversion-apcu \
@@ -52,10 +48,13 @@ RUN apt -y --no-install-recommends install \
         php$phpversion-curl \
         php$phpversion-mcrypt \
         php$phpversion-fpm \
-        less nano wget curl
+        less nano wget
 
 RUN apt -y --no-install-recommends install nodejs sudo openssh-server rsyslog cron mariadb-client
 
+# Install nodejs repository
+RUN curl -fsSL https://deb.nodesource.com/setup_19.x | bash -
+
 RUN apt -y --no-install-recommends install locales
 RUN sed -i '/$locale.UTF-8/s/^# //g' /etc/locale.gen && \
     locale-gen
@@ -66,7 +65,7 @@ ENV LC_ALL $locale.UTF-8
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 # IF you need some npm globally installed packages
-# RUN npm install --unsafe-perm --global
+RUN npm install --unsafe-perm --global yarn
 
 CMD ["php", "-a"]