Skip to content

Commit fbe130c

Browse files
akafengakafeng
committed
fix: composer crash
1 parent af308ea commit fbe130c

File tree

3 files changed

+36
-3
lines changed

3 files changed

+36
-3
lines changed

‎Dockerfile-8.1

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ ARG PICKLE_URL="https://github.com/FriendsOfPHP/pickle/releases/download/v${PICK
1616
ARG COMPOSER_VERSION="2.7.1"
1717
ARG COMPOSER_URL="https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar"
1818

19+
ARG SWOOLE_VERSION="5.1.2"
20+
ARG SWOOLE_URL="https://github.com/swoole/swoole-src/archive/refs/tags/v${SWOOLE_VERSION}.tar.gz"
21+
1922
RUN set -eux \
2023
&& apt-get update -qyy \
2124
&& apt-get install -qyy --no-install-recommends --no-install-suggests \
@@ -121,6 +124,7 @@ RUN { pickle install apcu --no-interaction --defaults || true; } \
121124
&& make -j $(nproc) \
122125
&& make install \
123126
&& docker-php-ext-enable apcu \
127+
&& { rm -rf /tmp/apcu/ || true; } \
124128
&& { rm -rf /usr/local/lib/php/test/apcu/ || true; } \
125129
&& { rm -rf /usr/local/lib/php/doc/apcu/ || true; }
126130

@@ -179,6 +183,7 @@ RUN apt-get update -qyy \
179183
&& make -j $(nproc) \
180184
&& make install \
181185
&& docker-php-ext-enable imagick \
186+
&& { rm -rf /tmp/imagick/ || true; } \
182187
&& { rm -rf /usr/local/lib/php/test/imagick/ || true; } \
183188
&& { rm -rf /usr/local/lib/php/doc/imagick/ || true; }
184189

@@ -200,6 +205,7 @@ RUN apt-get update -qyy \
200205
&& make -j $(nproc) \
201206
&& make install \
202207
&& docker-php-ext-enable memcached \
208+
&& { rm -rf /tmp/memcached/ || true; } \
203209
&& { rm -rf /usr/local/lib/php/test/memcached/ || true; } \
204210
&& { rm -rf /usr/local/lib/php/doc/memcached/ || true; }
205211

@@ -246,6 +252,7 @@ RUN { pickle install redis --no-interaction --defaults || true; } \
246252
&& make -j $(nproc) \
247253
&& make install \
248254
&& docker-php-ext-enable redis \
255+
&& { rm -rf /tmp/redis/ || true; } \
249256
&& { rm -rf /usr/local/lib/php/test/redis/ || true; } \
250257
&& { rm -rf /usr/local/lib/php/doc/redis/ || true; }
251258

@@ -275,7 +282,9 @@ RUN apt-get update -qyy \
275282
libc-ares-dev \
276283
&& rm -rf /var/lib/apt/lists/* /var/log/* \
277284
\
278-
&& { pickle install swoole --no-interaction --defaults || true; } \
285+
&& wget -O swoole.tar.gz ${SWOOLE_URL} \
286+
&& mkdir /tmp/swoole/ \
287+
&& tar -xzvf swoole.tar.gz -C /tmp/swoole/ \
279288
&& cd /tmp/swoole/swoole*/ \
280289
&& phpize \
281290
&& ./configure \
@@ -284,9 +293,11 @@ RUN apt-get update -qyy \
284293
--enable-cares \
285294
--enable-brotli \
286295
--enable-swoole-pgsql \
296+
--enable-swoole-sqlite \
287297
&& make -j $(nproc) \
288298
&& make install \
289299
&& docker-php-ext-enable swoole \
300+
&& { rm -rf /tmp/swoole/ || true; } \
290301
&& { rm -rf /usr/local/lib/php/test/swoole/ || true; } \
291302
&& { rm -rf /usr/local/lib/php/doc/swoole/ || true; }
292303

‎Dockerfile-8.2

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ ARG PICKLE_URL="https://github.com/FriendsOfPHP/pickle/releases/download/v${PICK
1616
ARG COMPOSER_VERSION="2.7.1"
1717
ARG COMPOSER_URL="https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar"
1818

19+
ARG SWOOLE_VERSION="5.1.2"
20+
ARG SWOOLE_URL="https://github.com/swoole/swoole-src/archive/refs/tags/v${SWOOLE_VERSION}.tar.gz"
21+
1922
RUN set -eux \
2023
&& apt-get update -qyy \
2124
&& apt-get install -qyy --no-install-recommends --no-install-suggests \
@@ -121,6 +124,7 @@ RUN { pickle install apcu --no-interaction --defaults || true; } \
121124
&& make -j $(nproc) \
122125
&& make install \
123126
&& docker-php-ext-enable apcu \
127+
&& { rm -rf /tmp/apcu/ || true; } \
124128
&& { rm -rf /usr/local/lib/php/test/apcu/ || true; } \
125129
&& { rm -rf /usr/local/lib/php/doc/apcu/ || true; }
126130

@@ -179,6 +183,7 @@ RUN apt-get update -qyy \
179183
&& make -j $(nproc) \
180184
&& make install \
181185
&& docker-php-ext-enable imagick \
186+
&& { rm -rf /tmp/imagick/ || true; } \
182187
&& { rm -rf /usr/local/lib/php/test/imagick/ || true; } \
183188
&& { rm -rf /usr/local/lib/php/doc/imagick/ || true; }
184189

@@ -200,6 +205,7 @@ RUN apt-get update -qyy \
200205
&& make -j $(nproc) \
201206
&& make install \
202207
&& docker-php-ext-enable memcached \
208+
&& { rm -rf /tmp/memcached/ || true; } \
203209
&& { rm -rf /usr/local/lib/php/test/memcached/ || true; } \
204210
&& { rm -rf /usr/local/lib/php/doc/memcached/ || true; }
205211

@@ -246,6 +252,7 @@ RUN { pickle install redis --no-interaction --defaults || true; } \
246252
&& make -j $(nproc) \
247253
&& make install \
248254
&& docker-php-ext-enable redis \
255+
&& { rm -rf /tmp/redis/ || true; } \
249256
&& { rm -rf /usr/local/lib/php/test/redis/ || true; } \
250257
&& { rm -rf /usr/local/lib/php/doc/redis/ || true; }
251258

@@ -275,7 +282,9 @@ RUN apt-get update -qyy \
275282
libc-ares-dev \
276283
&& rm -rf /var/lib/apt/lists/* /var/log/* \
277284
\
278-
&& { pickle install swoole --no-interaction --defaults || true; } \
285+
&& wget -O swoole.tar.gz ${SWOOLE_URL} \
286+
&& mkdir /tmp/swoole/ \
287+
&& tar -xzvf swoole.tar.gz -C /tmp/swoole/ \
279288
&& cd /tmp/swoole/swoole*/ \
280289
&& phpize \
281290
&& ./configure \
@@ -284,9 +293,11 @@ RUN apt-get update -qyy \
284293
--enable-cares \
285294
--enable-brotli \
286295
--enable-swoole-pgsql \
296+
--enable-swoole-sqlite \
287297
&& make -j $(nproc) \
288298
&& make install \
289299
&& docker-php-ext-enable swoole \
300+
&& { rm -rf /tmp/swoole/ || true; } \
290301
&& { rm -rf /usr/local/lib/php/test/swoole/ || true; } \
291302
&& { rm -rf /usr/local/lib/php/doc/swoole/ || true; }
292303

‎Dockerfile-8.3

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ ARG PICKLE_URL="https://github.com/FriendsOfPHP/pickle/releases/download/v${PICK
1616
ARG COMPOSER_VERSION="2.7.1"
1717
ARG COMPOSER_URL="https://getcomposer.org/download/${COMPOSER_VERSION}/composer.phar"
1818

19+
ARG SWOOLE_VERSION="5.1.2"
20+
ARG SWOOLE_URL="https://github.com/swoole/swoole-src/archive/refs/tags/v${SWOOLE_VERSION}.tar.gz"
21+
1922
RUN set -eux \
2023
&& apt-get update -qyy \
2124
&& apt-get install -qyy --no-install-recommends --no-install-suggests \
@@ -121,6 +124,7 @@ RUN { pickle install apcu --no-interaction --defaults || true; } \
121124
&& make -j $(nproc) \
122125
&& make install \
123126
&& docker-php-ext-enable apcu \
127+
&& { rm -rf /tmp/apcu/ || true; } \
124128
&& { rm -rf /usr/local/lib/php/test/apcu/ || true; } \
125129
&& { rm -rf /usr/local/lib/php/doc/apcu/ || true; }
126130

@@ -179,6 +183,7 @@ RUN apt-get update -qyy \
179183
&& make -j $(nproc) \
180184
&& make install \
181185
&& docker-php-ext-enable imagick \
186+
&& { rm -rf /tmp/imagick/ || true; } \
182187
&& { rm -rf /usr/local/lib/php/test/imagick/ || true; } \
183188
&& { rm -rf /usr/local/lib/php/doc/imagick/ || true; }
184189

@@ -200,6 +205,7 @@ RUN apt-get update -qyy \
200205
&& make -j $(nproc) \
201206
&& make install \
202207
&& docker-php-ext-enable memcached \
208+
&& { rm -rf /tmp/memcached/ || true; } \
203209
&& { rm -rf /usr/local/lib/php/test/memcached/ || true; } \
204210
&& { rm -rf /usr/local/lib/php/doc/memcached/ || true; }
205211

@@ -246,6 +252,7 @@ RUN { pickle install redis --no-interaction --defaults || true; } \
246252
&& make -j $(nproc) \
247253
&& make install \
248254
&& docker-php-ext-enable redis \
255+
&& { rm -rf /tmp/redis/ || true; } \
249256
&& { rm -rf /usr/local/lib/php/test/redis/ || true; } \
250257
&& { rm -rf /usr/local/lib/php/doc/redis/ || true; }
251258

@@ -275,7 +282,9 @@ RUN apt-get update -qyy \
275282
libc-ares-dev \
276283
&& rm -rf /var/lib/apt/lists/* /var/log/* \
277284
\
278-
&& { pickle install swoole --no-interaction --defaults || true; } \
285+
&& wget -O swoole.tar.gz ${SWOOLE_URL} \
286+
&& mkdir /tmp/swoole/ \
287+
&& tar -xzvf swoole.tar.gz -C /tmp/swoole/ \
279288
&& cd /tmp/swoole/swoole*/ \
280289
&& phpize \
281290
&& ./configure \
@@ -284,9 +293,11 @@ RUN apt-get update -qyy \
284293
--enable-cares \
285294
--enable-brotli \
286295
--enable-swoole-pgsql \
296+
--enable-swoole-sqlite \
287297
&& make -j $(nproc) \
288298
&& make install \
289299
&& docker-php-ext-enable swoole \
300+
&& { rm -rf /tmp/swoole/ || true; } \
290301
&& { rm -rf /usr/local/lib/php/test/swoole/ || true; } \
291302
&& { rm -rf /usr/local/lib/php/doc/swoole/ || true; }
292303

0 commit comments

Comments
 (0)