Skip to content

Commit

Permalink
add composer version switch
Browse files Browse the repository at this point in the history
  • Loading branch information
@htuscher
htuscher committed Oct 26, 2020
1 parent 05d8748 commit c8e6bb5
Show file tree
Hide file tree
Showing 94 changed files with 260 additions and 63 deletions.
4 changes: 3 additions & 1 deletion docker/php-official/5.6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -222,7 +223,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/5.6/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -227,7 +228,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.0/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.1-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV APPLICATION_USER=application \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -242,7 +243,8 @@ RUN set -x \
libmemcached-dev \
yaml-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.1-alpine/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #}
{{ environment.phpAlpineIconvWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.1/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -227,7 +228,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.1/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.2-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV APPLICATION_USER=application \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -246,7 +247,8 @@ RUN set -x \
libmemcached-dev \
yaml-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.2-alpine/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #}
{{ environment.phpAlpineIconvWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.2/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -226,7 +227,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.2/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.3-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV APPLICATION_USER=application \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -246,7 +247,8 @@ RUN set -x \
libmemcached-dev \
yaml-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.3-alpine/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #}
{{ environment.phpAlpineIconvWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.3/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -230,7 +231,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.3/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.4-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV APPLICATION_USER=application \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -246,7 +247,8 @@ RUN set -x \
libmemcached-dev \
yaml-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.4-alpine/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #}
{{ environment.phpAlpineIconvWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/7.4/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -229,7 +230,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/7.4/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/8.0-alpine/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ ENV APPLICATION_USER=application \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -248,7 +249,8 @@ RUN set -x \
libmemcached-dev \
yaml-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/8.0-alpine/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }} {# Check if needed #}
{{ environment.phpAlpineIconvWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
4 changes: 3 additions & 1 deletion docker/php-official/8.0/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ ENV APPLICATION_USER=application \
APPLICATION_UID=1000 \
APPLICATION_GID=1000
ENV PHP_SENDMAIL_PATH="/usr/sbin/sendmail -t -i"
ENV COMPOSER_VERSION="2"


# Baselayout copy (from staged image)
Expand Down Expand Up @@ -218,7 +219,8 @@ RUN set -x \
librabbitmq-dev \
libmagick++-dev \
&& rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
# Enable php services
&& docker-service enable syslog \
&& docker-service enable cron \
Expand Down
1 change: 1 addition & 0 deletions docker/php-official/8.0/Dockerfile.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
{{ environment.base() }}
{{ environment.baseApp() }}
{{ environment.phpOfficialSendmailWorkaround() }}
{{ environment.phpComposerVersion() }}

{{ baselayout.copy() }}

Expand Down
3 changes: 3 additions & 0 deletions docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,3 +70,6 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
rm -f ${ini_dir_fpm}/*${DISABLE_MOD}*
done
fi

# Link composer version accordingly
ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer

1 comment on commit c8e6bb5

@calebfavor
Copy link

@calebfavor calebfavor commented on c8e6bb5 Oct 27, 2020 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hhoechtl - This update has caused a bunch of further problems for us. We have some composer commands in our dockerfile which no longer work without changing them to use composer1 or composer2 as the command. We also run composer commands before the entrypoint in our kubernetes setup. That breaks for the same reason. I do not know of an advantage to using composer1 and composer2 and symlinking in the entrypoint. If we were to update to composer 2 in the future we would need to update the composer commands in multiple places. Is it possible to simply always install the version from the env var under /usr/local/bin/composer?

I believe something like this will do it:
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer --${COMPOSER_VERSION:-2} \

Please sign in to comment.