Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release 1.35.1 into 2.0.x #191

Merged
merged 3 commits into from
Oct 1, 2023
+16 −8
Merged

Merge release 1.35.1 into 2.0.x #191

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
12706d3
bugfix: temporarily copy some files required by `phpize` during conta…
boesing Oct 1, 2023
efce4f1
qa: re-order composer installation and default PHP version handling
boesing Oct 1, 2023
68a1fee
bugfix: remove trailing backslash to avoid appending the upcoming `RU…
boesing Oct 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,14 @@ RUN export OS_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '"' -f2)
&& apt autoremove -y \
&& apt clean

# Temporary fix for https://github.com/laminas/laminas-continuous-integration-action/issues/188
RUN cp \
/usr/share/libtool/build-aux/config.sub \
/usr/share/libtool/build-aux/config.guess \
/usr/share/libtool/build-aux/ltmain.sh \
/usr/bin/shtool \
/usr/lib/php/20230831/build

# Build/install static modules that do not have packages
COPY mods-available /mods-available
COPY mods-install /mods-install
Expand Down Expand Up @@ -167,21 +175,21 @@ COPY composer.json \
composer.lock \
/tools/

RUN cd /tools \
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
&& apt install -y php-bcmath php8.3-bcmath \
&& composer install \
--classmap-authoritative

# Set default PHP version based on the `composer.json` `config.platform.php` setting
RUN export DEFAULT_PHP_VERSION=$(jq -r '.config.platform.php | sub("(?<minor>[0-9.]).99$"; "\(.minor)")' /tools/composer.json) \
# Cleanup composer files from external tools folder
&& rm /tools/composer.* \
&& update-alternatives --set php /usr/bin/php$DEFAULT_PHP_VERSION \
&& update-alternatives --set phpize /usr/bin/phpize$DEFAULT_PHP_VERSION \
&& update-alternatives --set php-config /usr/bin/php-config$DEFAULT_PHP_VERSION \
&& echo "DEFAULT_PHP_VERSION=${DEFAULT_PHP_VERSION}" >> /etc/environment

RUN cd /tools \
# Install `ext-bcmath` as it seems to be a requirement for `roave/backward-compatibility-check`
&& apt install -y php-bcmath \
&& composer install \
--classmap-authoritative \
# Cleanup composer files from external tools folder
&& rm /tools/composer.*

# Copy staabm/annotate-pull-request-from-checkstyle to external-tools stage
RUN ln -s /tools/vendor/bin/cs2pr /usr/local/bin/cs2pr

Expand Down