Skip to content

Commit f1036d9

Browse files
committed
Remove php:<8.0 support, effectively removing all binaries and extensions from the container
Needs laminas/laminas-ci-matrix-action#196
1 parent e9cfefa commit f1036d9

File tree

4 files changed

+5
-113
lines changed

4 files changed

+5
-113
lines changed

Dockerfile

Lines changed: 0 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -78,102 +78,6 @@ RUN apt update \
7878
\
7979
php-pear \
8080
\
81-
php5.6-bz2 \
82-
php5.6-cli \
83-
php5.6-curl \
84-
php5.6-dev \
85-
php5.6-fileinfo \
86-
php5.6-intl \
87-
php5.6-json \
88-
php5.6-mbstring \
89-
php5.6-phar \
90-
php5.6-phpdbg \
91-
php5.6-readline \
92-
php5.6-sockets \
93-
php5.6-xml \
94-
php5.6-xsl \
95-
php5.6-zip \
96-
\
97-
php7.0-cli \
98-
php7.0-bz2 \
99-
php7.0-curl \
100-
php7.0-dev \
101-
php7.0-fileinfo \
102-
php7.0-intl \
103-
php7.0-json \
104-
php7.0-mbstring \
105-
php7.0-phar \
106-
php7.0-phpdbg \
107-
php7.0-readline \
108-
php7.0-sockets \
109-
php7.0-xml \
110-
php7.0-xsl \
111-
php7.0-zip \
112-
\
113-
php7.1-cli \
114-
php7.1-bz2 \
115-
php7.1-curl \
116-
php7.1-dev \
117-
php7.1-fileinfo \
118-
php7.1-intl \
119-
php7.1-json \
120-
php7.1-mbstring \
121-
php7.1-pcov \
122-
php7.1-phar \
123-
php7.1-readline \
124-
php7.1-sockets \
125-
php7.1-xml \
126-
php7.1-xsl \
127-
php7.1-zip \
128-
\
129-
php7.2-cli \
130-
php7.2-bz2 \
131-
php7.2-curl \
132-
php7.2-dev \
133-
php7.2-fileinfo \
134-
php7.2-intl \
135-
php7.2-json \
136-
php7.2-mbstring \
137-
php7.2-pcov \
138-
php7.2-phar \
139-
php7.2-readline \
140-
php7.2-sockets \
141-
php7.2-xml \
142-
php7.2-xsl \
143-
php7.2-zip \
144-
\
145-
php7.3-cli \
146-
php7.3-bz2 \
147-
php7.3-curl \
148-
php7.3-dev \
149-
php7.3-fileinfo \
150-
php7.3-intl \
151-
php7.3-json \
152-
php7.3-mbstring \
153-
php7.3-pcov \
154-
php7.3-phar \
155-
php7.3-readline \
156-
php7.3-sockets \
157-
php7.3-xml \
158-
php7.3-xsl \
159-
php7.3-zip \
160-
\
161-
php7.4-cli \
162-
php7.4-bz2 \
163-
php7.4-curl \
164-
php7.4-dev \
165-
php7.4-fileinfo \
166-
php7.4-intl \
167-
php7.4-json \
168-
php7.4-mbstring \
169-
php7.4-pcov \
170-
php7.4-phar \
171-
php7.4-readline \
172-
php7.4-sockets \
173-
php7.4-xml \
174-
php7.4-xsl \
175-
php7.4-zip \
176-
\
17781
php8.0-cli \
17882
php8.0-bz2 \
17983
php8.0-curl \

README.md

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -213,10 +213,10 @@ The tricks to remember are:
213213
- You need to set the container WORKDIR to that volume.
214214
- You need to provide the job JSON.
215215

216-
As an example, if you wanted to run the CS checks under PHP 7.4 using locked dependencies, you could do something like the following:
216+
As an example, if you wanted to run the CS checks under PHP 8.2 using locked dependencies, you could do something like the following:
217217

218218
```bash
219-
$ docker run -v $(realpath .):/github/workspace -w=/github/workspace laminas-check-runner:latest '{"php":"7.4","dependencies":"locked","extensions":[],"ini":["memory_limit=-1"],"command":"./vendor/bin/phpcs"}'
219+
$ docker run -v $(realpath .):/github/workspace -w=/github/workspace laminas-check-runner:latest '{"php":"8.2","dependencies":"locked","extensions":[],"ini":["memory_limit=-1"],"command":"./vendor/bin/phpcs"}'
220220
```
221221

222222
The trick to remember: the job JSON should generally be in single quotes, to allow the `"` characters used to delimit properties and strings in the JSON to not cause interpolation issues.
@@ -225,12 +225,6 @@ The trick to remember: the job JSON should generally be in single quotes, to all
225225

226226
The container the action provides and consumes builds off the ubuntu:focal image, installs the [Sury PHP repository](https://deb.sury.org/), and installs PHP versions:
227227

228-
- 5.6
229-
- 7.0
230-
- 7.1
231-
- 7.2
232-
- 7.3
233-
- 7.4
234228
- 8.0
235229
- 8.1
236230
- 8.2
@@ -250,7 +244,7 @@ Each provides the following extensions by default:
250244
- xsl
251245
- zip
252246

253-
You may specify other extensions to install during a job by selecting them from the list of packages in the Sury repository, and dropping the `php{VERSION}` prefix; e.g., the package "php7.4-tidy" provides the "tidy" extension, so you would only specify "tidy" if you want to include that extension for your build.
247+
You may specify other extensions to install during a job by selecting them from the list of packages in the Sury repository, and dropping the `php{VERSION}` prefix; e.g., the package "php8.2-tidy" provides the "tidy" extension, so you would only specify "tidy" if you want to include that extension for your build.
254248

255249
We also provide the following extensions:
256250

mods-install/install_sqlsrv.sh

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,16 @@ set -e
55
cd tmp
66

77
# Download extension versions from MS
8-
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.9.0/Ubuntu2004-7.3.tar | tar xf - --strip-components=1 Ubuntu2004-7.3/php_pdo_sqlsrv_73_nts.so Ubuntu2004-7.3/php_sqlsrv_73_nts.so
9-
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-7.4.tar | tar xf - --strip-components=1 Ubuntu2004-7.4/php_pdo_sqlsrv_74_nts.so Ubuntu2004-7.4/php_sqlsrv_74_nts.so
108
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-8.0.tar | tar xf - --strip-components=1 Ubuntu2004-8.0/php_pdo_sqlsrv_80_nts.so Ubuntu2004-8.0/php_sqlsrv_80_nts.so
119
curl -L https://github.com/microsoft/msphpsql/releases/download/v5.10.0/Ubuntu2004-8.1.tar | tar xf - --strip-components=1 Ubuntu2004-8.1/php_pdo_sqlsrv_81_nts.so Ubuntu2004-8.1/php_sqlsrv_81_nts.so
1210

1311
# Copy extensions to appropriate locations for each PHP version
14-
mv php_pdo_sqlsrv_73_nts.so "$(php7.3 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/pdo_sqlsrv.so"
15-
mv php_sqlsrv_73_nts.so "$(php7.3 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/sqlsrv.so"
16-
mv php_pdo_sqlsrv_74_nts.so "$(php7.4 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/pdo_sqlsrv.so"
17-
mv php_sqlsrv_74_nts.so "$(php7.4 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/sqlsrv.so"
1812
mv php_pdo_sqlsrv_80_nts.so "$(php8.0 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/pdo_sqlsrv.so"
1913
mv php_sqlsrv_80_nts.so "$(php8.0 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/sqlsrv.so"
2014
mv php_pdo_sqlsrv_81_nts.so "$(php8.1 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/pdo_sqlsrv.so"
2115
mv php_sqlsrv_81_nts.so "$(php8.1 -i | grep -P '^extension_dir' | sed -E -e 's/^extension_dir\s+=>\s+\S+\s+=>\s+(.*)$/\1/')/sqlsrv.so"
2216

2317
# Copy conf file to appropriate locations
24-
for PHP_VERSION in 7.3 7.4 8.0 8.1;do
18+
for PHP_VERSION in 8.0 8.1;do
2519
cp /mods-available/sqlsrv.ini "/etc/php/${PHP_VERSION}/mods-available/sqlsrv.ini"
2620
done

scripts/php_ini_dev_settings.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ SUBSTITUTIONS+=('s/mysqlnd.collect_memory_statistics ?= ?(On|Off)/mysqlnd.collec
1414
SUBSTITUTIONS+=('s/zend.assertions ?= ?(-1|1)/zend.assertions = 1/')
1515
SUBSTITUTIONS+=('s/opcache.huge_code_pages ?= ?(0|1)/opcache.huge_code_pages = 0/')
1616

17-
for PHP_VERSION in 5.6 7.0 7.1 7.2 7.3 7.4 8.0 8.1 8.2;do
17+
for PHP_VERSION in 8.0 8.1 8.2;do
1818
INI_FILE="/etc/php/${PHP_VERSION}/cli/php.ini"
1919
for SUBSTITUTION in "${SUBSTITUTIONS[@]}";do
2020
sed --in-place -E -e "${SUBSTITUTION}" "${INI_FILE}"

0 commit comments

Comments
 (0)