Updating dockerfiles and entrypoint files according to latest system …

…requirements of adobe commerce (magento open source) on-premises

.gitignore

@@ -0,0 +1,3 @@
+/.sync
+/Icon?
+/.idea

magepack/Dockerfile

@@ -6,7 +6,7 @@ WORKDIR /var/www/html
 COPY bin/generate.sh /usr/bin/generate
 COPY bin/bundle.sh /usr/bin/bundle
 
-ARG MAGEPACK_VERSION=2.3
+ARG MAGEPACK_VERSION=2.11
 RUN npm install -g magepack@^${MAGEPACK_VERSION} && npm cache clean --force
 
 CMD tail -f /dev/null

php-fpm/Dockerfile

@@ -19,7 +19,7 @@ RUN dnf install -y which pv sudo bind-utils python3-pip bash-completion rsync so
     && dnf clean all \
     && rm -rf /var/cache/dnf
 
-ENV NODE_VERSION    18
+ENV NODE_VERSION 20
 RUN npm install -g n \
     && n install ${NODE_VERSION} \
     && rm -rf /usr/local/n/versions/node

php-fpm/context/docker-entrypoint

@@ -27,10 +27,12 @@ fi
 sudo crond
 
 # Configure composer2 as default when specified
-if [[ "${COMPOSER_VERSION:=2}" == "2.2" ]]; then
-  sudo cp /usr/bin/composer2lts /usr/bin/composer
-elif [[ "${COMPOSER_VERSION}" == "2" ]]; then
+COMPOSER_VERSION="${COMPOSER_VERSION:=2}"
+
+if [[ "$COMPOSER_VERSION" == "2" || "$COMPOSER_VERSION" == "latest" ]]; then
   sudo cp /usr/bin/composer2 /usr/bin/composer
+elif [[ "$COMPOSER_VERSION" == "2.2" || "$COMPOSER_VERSION" == "lts" ]]; then
+  sudo cp /usr/bin/composer2lts /usr/bin/composer
 else
   sudo cp /usr/bin/composer1 /usr/bin/composer
 fi

php/cli/Dockerfile

@@ -3,6 +3,7 @@ FROM quay.io/centos/centos:stream9
 ARG PHP_VERSION
 ARG PHP_EXTENSIONS="bcmath cli common gd gmp intl json mbstring \
     mcrypt sodium mysqlnd pgsql opcache pdo pdo_pgsql pecl-msgpack pecl-amqp pecl-redis pecl-imagick pecl-zip pecl-openswoole process soap xml xmlrpc"
+ARG COMPOSER_VERSION=2.7
 
 RUN dnf update -y \
     && dnf clean all \
@@ -30,5 +31,5 @@ RUN set -eux \
 ENV COMPOSER_ALLOW_SUPERUSER 1
 ENV COMPOSER_HOME /tmp/composer
 COPY --from=composer:1 /usr/bin/composer /usr/bin/composer1
-COPY --from=composer:2 /usr/bin/composer /usr/bin/composer2
-COPY --from=composer:2.2 /usr/bin/composer /usr/bin/composer2lts
+COPY --from=composer:${COMPOSER_VERSION} /usr/bin/composer /usr/bin/composer2
+COPY --from=composer:lts /usr/bin/composer /usr/bin/composer2lts