Skip to content

Commit 931e7fc

Browse files
fabriciojsfabriciojs
committed
auto generate Dockerfiles - default to composer 2.x
1 parent 4868ebd commit 931e7fc

10 files changed

Lines changed: 40 additions & 30 deletions

File tree

‎7.1-prod/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ RUN adduser -D -u 1337 kool \
6262
&& docker-php-ext-enable redis \
6363
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
6464
# composer
65-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
66-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
67-
&& su-exec kool composer global require hirak/prestissimo \
65+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
66+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
67+
# symlink composer2 for BC
68+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6869
# cleanup
6970
&& apk del .build-deps \
7071
&& rm -rf /var/cache/apk/* /tmp/*

‎7.1/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ RUN adduser -D -u 1337 kool \
6363
&& docker-php-ext-enable redis \
6464
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
6565
# composer
66-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
67-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
68-
&& su-exec kool composer global require hirak/prestissimo \
66+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
67+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
68+
# symlink composer2 for BC
69+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6970
# cleanup
7071
&& apk del .build-deps \
7172
&& rm -rf /var/cache/apk/* /tmp/*

‎7.2-prod/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ RUN adduser -D -u 1337 kool \
6262
&& docker-php-ext-enable redis \
6363
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
6464
# composer
65-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
66-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
67-
&& su-exec kool composer global require hirak/prestissimo \
65+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
66+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
67+
# symlink composer2 for BC
68+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6869
# cleanup
6970
&& apk del .build-deps \
7071
&& rm -rf /var/cache/apk/* /tmp/*

‎7.2/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ RUN adduser -D -u 1337 kool \
6363
&& docker-php-ext-enable redis \
6464
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
6565
# composer
66-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
67-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
68-
&& su-exec kool composer global require hirak/prestissimo \
66+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
67+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
68+
# symlink composer2 for BC
69+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6970
# cleanup
7071
&& apk del .build-deps \
7172
&& rm -rf /var/cache/apk/* /tmp/*

‎7.3-prod/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,10 @@ RUN adduser -D -u 1337 kool \
6262
&& docker-php-ext-enable redis \
6363
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
6464
# composer
65-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
66-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
67-
&& su-exec kool composer global require hirak/prestissimo \
65+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
66+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
67+
# symlink composer2 for BC
68+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6869
# cleanup
6970
&& apk del .build-deps \
7071
&& rm -rf /var/cache/apk/* /tmp/*

‎7.3/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ RUN adduser -D -u 1337 kool \
6363
&& docker-php-ext-enable redis \
6464
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
6565
# composer
66-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
67-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
68-
&& su-exec kool composer global require hirak/prestissimo \
66+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
67+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
68+
# symlink composer2 for BC
69+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6970
# cleanup
7071
&& apk del .build-deps \
7172
&& rm -rf /var/cache/apk/* /tmp/*

‎7.4-prod/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,10 @@ RUN adduser -D -u 1337 kool \
5959
&& docker-php-ext-enable redis \
6060
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
6161
# composer
62-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
63-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
64-
&& su-exec kool composer global require hirak/prestissimo \
62+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
63+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
64+
# symlink composer2 for BC
65+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6566
# cleanup
6667
&& apk del .build-deps \
6768
&& rm -rf /var/cache/apk/* /tmp/*

‎7.4/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,10 @@ RUN adduser -D -u 1337 kool \
6060
&& docker-php-ext-enable redis \
6161
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
6262
# composer
63-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
64-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
65-
&& su-exec kool composer global require hirak/prestissimo \
63+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
64+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
65+
# symlink composer2 for BC
66+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
6667
# cleanup
6768
&& apk del .build-deps \
6869
&& rm -rf /var/cache/apk/* /tmp/*

‎8.0-prod/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,10 @@ RUN adduser -D -u 1337 kool \
6767
&& docker-php-ext-enable redis \
6868
&& cp "/usr/local/etc/php/php.ini-production" "/usr/local/etc/php/php.ini" \
6969
# composer
70-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
71-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
72-
&& su-exec kool composer global require hirak/prestissimo \
70+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
71+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
72+
# symlink composer2 for BC
73+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
7374
# cleanup
7475
&& apk del .build-deps \
7576
&& rm -rf /var/cache/apk/* /tmp/*

‎8.0/Dockerfile‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,10 @@ RUN adduser -D -u 1337 kool \
6868
&& docker-php-ext-enable redis \
6969
&& cp "/usr/local/etc/php/php.ini-development" "/usr/local/etc/php/php.ini" \
7070
# composer
71-
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer \
72-
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer2 \
73-
&& su-exec kool composer global require hirak/prestissimo \
71+
&& curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \
72+
&& curl -sS https://getcomposer.org/installer | php -- --1 --install-dir=/usr/local/bin --filename=composer1 \
73+
# symlink composer2 for BC
74+
&& ln -s /usr/local/bin/composer /usr/local/bin/composer2 \
7475
# cleanup
7576
&& apk del .build-deps \
7677
&& rm -rf /var/cache/apk/* /tmp/*

0 commit comments

Comments
 (0)