Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating dockerfiles and entrypoint files according to latest system requirements of adobe commerce (magento open source) on-premises #34

Merged
merged 1 commit into from
Sep 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion magepack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion php-fpm/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions php-fpm/context/docker-entrypoint
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,16 @@ fi
sudo crond

# Configure composer2 as default when specified
if [[ "${COMPOSER_VERSION:=2}" == "2.2" ]]; then
COMPOSER_VERSION="${COMPOSER_VERSION:=2}"

if [[ "$COMPOSER_VERSION" =~ ^1(\.[0-9]+){0,2}$ ]]; then
sudo cp /usr/bin/composer1 /usr/bin/composer
elif [[ "$COMPOSER_VERSION" =~ ^2\.2(\.[0-9]+)?$ ]]; then
sudo cp /usr/bin/composer2lts /usr/bin/composer
elif [[ "${COMPOSER_VERSION}" == "2" ]]; then
elif [[ "$COMPOSER_VERSION" =~ ^2(\.[0-9]+){0,2}$ ]]; then
sudo cp /usr/bin/composer2 /usr/bin/composer
else
sudo cp /usr/bin/composer1 /usr/bin/composer
sudo cp /usr/bin/composer2 /usr/bin/composer
fi

# Resolve permission issues with directories auto-created by volume mounts; to use set CHOWN_DIR_LIST to
Expand Down
1 change: 1 addition & 0 deletions php/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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-swoole process soap xml xmlrpc"
ARG COMPOSER_VERSION=2

RUN dnf update -y \
&& dnf clean all \
Expand Down