Skip to content

Commit 05d8748

Browse files
author
Christian Benthake
committed
Adding composer1 as backup for older projects
1 parent 3ea4e70 commit 05d8748

File tree

4 files changed

+21
-2
lines changed

4 files changed

+21
-2
lines changed

template/Dockerfile/images/hhvm.jinja2

+4-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
graphicsmagick \
1313
ghostscript \
1414
&& /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \
15-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
15+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
16+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16
1617
{%- endmacro %}
1718

1819

@@ -26,5 +27,6 @@
2627
graphicsmagick \
2728
ghostscript \
2829
&& /usr/bin/update-alternatives --install /usr/bin/php php /usr/bin/hhvm 60 \
29-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer
30+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
31+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16
3032
{%- endmacro %}

template/Dockerfile/images/php5.jinja2

+10
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@
6666
# && pear upgrade-all \
6767
&& pear config-set auto_discover 1 \
6868
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
69+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
6970
# PECL workaround, see webdevops/Dockerfile#78
7071
&& sed -i "s/ -n / /" $(which pecl) \
7172
# && apk-install gcc php5-dev autoconf --virtual .pecl-deps \
@@ -121,6 +122,7 @@
121122
&& pear config-set auto_discover 1 \
122123
&& pecl install imagick \
123124
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
125+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
124126
# Cleanup
125127
&& yum erase -y php-devel gcc \
126128
{{ services.php() }}
@@ -166,6 +168,7 @@
166168
&& pecl install imagick \
167169
# && pecl install redis \
168170
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
171+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
169172
# Cleanup
170173
&& yum erase -y php-devel gcc \
171174
{{ services.php() }}
@@ -207,6 +210,7 @@
207210
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
208211
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
209212
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
213+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
210214
{{ services.php() }}
211215
{%- endmacro %}
212216

@@ -248,6 +252,7 @@
248252
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
249253
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
250254
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
255+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
251256
{{ services.php() }}
252257
{%- endmacro %}
253258

@@ -289,6 +294,7 @@
289294
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
290295
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
291296
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
297+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
292298
{{ services.php() }}
293299
{%- endmacro %}
294300

@@ -329,6 +335,7 @@
329335
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
330336
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
331337
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
338+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
332339
{{ services.php() }}
333340
{%- endmacro %}
334341

@@ -369,6 +376,7 @@
369376
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
370377
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
371378
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
379+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
372380
{{ services.php() }}
373381
{%- endmacro %}
374382

@@ -411,6 +419,7 @@
411419
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
412420
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
413421
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
422+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
414423
{{ services.php() }}
415424
{%- endmacro %}
416425

@@ -445,6 +454,7 @@
445454
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/cli/conf.d/20-mcrypt.ini \
446455
&& ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
447456
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
457+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
448458
{{ services.php() }}
449459
{%- endmacro %}
450460

template/Dockerfile/images/php7.jinja2

+6
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
# && pear upgrade-all \
8080
&& pear config-set auto_discover 1 \
8181
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
82+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
8283
# PECL workaround, see webdevops/Dockerfile#78
8384
&& sed -i "s/ -n / /" $(which pecl) \
8485
{{ services.php() }}
@@ -138,6 +139,7 @@
138139
php-apcu \
139140
php-amqp \
140141
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
142+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
141143
{{ services.php() }}
142144
{%- endmacro %}
143145

@@ -186,6 +188,7 @@
186188
php-amqp \
187189
&& pecl channel-update pecl.php.net \
188190
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
191+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
189192
{{ services.php() }}
190193
{%- endmacro %}
191194

@@ -232,6 +235,7 @@
232235
php-memcached \
233236
&& pecl channel-update pecl.php.net \
234237
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
238+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
235239
{{ services.php() }}
236240
{%- endmacro %}
237241

@@ -285,6 +289,7 @@
285289
php-memcached \
286290
&& pecl channel-update pecl.php.net \
287291
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
292+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
288293
{{ services.php() }}
289294
{%- endmacro %}
290295

@@ -331,6 +336,7 @@
331336
php70w-pecl-mongodb \
332337
&& pecl channel-update pecl.php.net \
333338
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
339+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
334340
&& pecl install redis \
335341
&& echo "extension=redis.so" > /etc/php.d/redis.ini \
336342
&& yum remove -y ImageMagick-devel php70w-devel gcc make \

template/Dockerfile/images/samson-deployment.jinja2

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && set -x \
3030
docker-compose \
3131
python-dotenv \
3232
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer \
33+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --version=1.10.16 \
3334
## Enable ansible for deployment user
3435
&& chmod 755 /usr/local/bin/ansible* \
3536
{{ docker.cleanup() }}

0 commit comments

Comments
 (0)