Skip to content

Commit

Permalink
Adding composer1 as backup for older projects
Browse files Browse the repository at this point in the history
  • Loading branch information
Christian Benthake committed Oct 26, 2020
1 parent 3ea4e70 commit 05d8748
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 2 deletions.
6 changes: 4 additions & 2 deletions template/Dockerfile/images/hhvm.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
graphicsmagick \
ghostscript \
&& /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \
&& 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=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16
{%- endmacro %}


Expand All @@ -26,5 +27,6 @@
graphicsmagick \
ghostscript \
&& /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \
&& 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=composer \
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16
{%- endmacro %}
10 changes: 10 additions & 0 deletions template/Dockerfile/images/php5.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
# && pear upgrade-all \
&& pear config-set auto_discover 1 \
&& 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=composer1 --version=1.10.16 \
# PECL workaround, see webdevops/Dockerfile#78
&& sed -i "s/ -n / /" $(which pecl) \
# && apk-install gcc php5-dev autoconf --virtual .pecl-deps \
Expand Down Expand Up @@ -121,6 +122,7 @@
&& pear config-set auto_discover 1 \
&& pecl install imagick \
&& 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=composer1 --version=1.10.16 \
# Cleanup
&& yum erase -y php-devel gcc \
{{ services.php() }}
Expand Down Expand Up @@ -166,6 +168,7 @@
&& pecl install imagick \
# && pecl install redis \
&& 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=composer1 --version=1.10.16 \
# Cleanup
&& yum erase -y php-devel gcc \
{{ services.php() }}
Expand Down Expand Up @@ -207,6 +210,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -248,6 +252,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -289,6 +294,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -329,6 +335,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -369,6 +376,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -411,6 +419,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -445,6 +454,7 @@
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

6 changes: 6 additions & 0 deletions template/Dockerfile/images/php7.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
# && pear upgrade-all \
&& pear config-set auto_discover 1 \
&& 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=composer1 --version=1.10.16 \
# PECL workaround, see webdevops/Dockerfile#78
&& sed -i "s/ -n / /" $(which pecl) \
{{ services.php() }}
Expand Down Expand Up @@ -138,6 +139,7 @@
php-apcu \
php-amqp \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -186,6 +188,7 @@
php-amqp \
&& pecl channel-update pecl.php.net \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -232,6 +235,7 @@
php-memcached \
&& pecl channel-update pecl.php.net \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -285,6 +289,7 @@
php-memcached \
&& pecl channel-update pecl.php.net \
&& 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=composer1 --version=1.10.16 \
{{ services.php() }}
{%- endmacro %}

Expand Down Expand Up @@ -331,6 +336,7 @@
php70w-pecl-mongodb \
&& pecl channel-update pecl.php.net \
&& 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=composer1 --version=1.10.16 \
&& pecl install redis \
&& echo "extension=redis.so" > /etc/php.d/redis.ini \
&& yum remove -y ImageMagick-devel php70w-devel gcc make \
Expand Down
1 change: 1 addition & 0 deletions template/Dockerfile/images/samson-deployment.jinja2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \
docker-compose \
python-dotenv \
&& 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=composer1 --version=1.10.16 \
## Enable ansible for deployment user
&& chmod 755 /usr/local/bin/ansible* \
{{ docker.cleanup() }}
Expand Down

0 comments on commit 05d8748

Please sign in to comment.