Skip to content

Commit 71bf983

Browse files
authored
Merge pull request #189 from boesing/bugfix/phpize-8.3-missing-tools
Temporarily copy some files required by `phpize` during container setup
2 parents 9d21d8d + 7a5bb2a commit 71bf983

File tree

1 file changed

+16
-8
lines changed

1 file changed

+16
-8
lines changed

Dockerfile

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,14 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
228228
&& apt autoremove -y \
229229
&& apt clean
230230

231+
# Temporary fix for https://github.com/laminas/laminas-continuous-integration-action/issues/188
232+
RUN cp \
233+
/usr/share/libtool/build-aux/config.sub \
234+
/usr/share/libtool/build-aux/config.guess \
235+
/usr/share/libtool/build-aux/ltmain.sh \
236+
/usr/bin/shtool \
237+
/usr/lib/php/20230831/build
238+
231239
# Build/install static modules that do not have packages
232240
COPY mods-available /mods-available
233241
COPY mods-install /mods-install
@@ -263,22 +271,22 @@ COPY composer.json \
263271
composer.lock \
264272
/tools/
265273

266-
RUN cd /tools \
267-
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
268-
&& apt install -y php-bcmath php8.3-bcmath \
269-
&& composer install \
270-
--classmap-authoritative
271-
272274
# Set default PHP version based on the `composer.json` `config.platform.php` setting
273275
RUN export DEFAULT_PHP_VERSION=$(jq -r '.config.platform.php | sub("(?<minor>[0-9.]).99$"; "\(.minor)")' /tools/composer.json) \
274-
# Cleanup composer files from external tools folder
275-
&& rm /tools/composer.* \
276276
&& update-alternatives --set php /usr/bin/php$DEFAULT_PHP_VERSION \
277277
&& update-alternatives --set phpize /usr/bin/phpize$DEFAULT_PHP_VERSION \
278278
&& update-alternatives --set php-config /usr/bin/php-config$DEFAULT_PHP_VERSION \
279279
&& update-alternatives --set phpdbg /usr/bin/phpdbg$DEFAULT_PHP_VERSION \
280280
&& echo "DEFAULT_PHP_VERSION=${DEFAULT_PHP_VERSION}" >> /etc/environment
281281

282+
RUN cd /tools \
283+
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
284+
&& apt install -y php-bcmath \
285+
&& composer install \
286+
--classmap-authoritative \
287+
# Cleanup composer files from external tools folder
288+
&& rm /tools/composer.*
289+
282290
# Copy staabm/annotate-pull-request-from-checkstyle to external-tools stage
283291
RUN ln -s /tools/vendor/bin/cs2pr /usr/local/bin/cs2pr
284292

0 commit comments

Comments
 (0)