Skip to content

Commit 47f9baa

Browse files
authored
Merge pull request #5 from letsdockerize/fix-readline
Fix readline
2 parents 773d60d + a2c0216 commit 47f9baa

File tree

3 files changed

+32
-16
lines changed

3 files changed

+32
-16
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414

1515
strategy:
1616
matrix:
17-
php_version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0']
17+
php_version: ['5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
1818

1919
steps:
2020
- name: Login to Docker Hub

Dockerfile

+4-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,10 @@ RUN set -eux; \
140140
RUN set -eux; \
141141
docker-php-ext-install sysvmsg sysvsem sysvshm
142142
# RUN set -eux; docker-php-ext-install tidy
143-
RUN set -eux; docker-php-ext-install tokenizer
143+
RUN set -eux; \
144+
if [ $(PHP_TAG_VERSION) != "8.1" ]; then \
145+
docker-php-ext-install tokenizer; \
146+
fi
144147
RUN set -eux; docker-php-ext-install xml
145148
# RUN set -eux; docker-php-ext-install xmlreader
146149
RUN set -eux; \

Makefile

+27-14
Original file line numberDiff line numberDiff line change
@@ -5,22 +5,24 @@ build-nc: build-php-nc
55
publish: publish-php
66

77
build-php:
8-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=5.6 -t letsdockerize/php:5.6 .
9-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.0 -t letsdockerize/php:7.0 .
10-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.1 -t letsdockerize/php:7.1 .
11-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.2 -t letsdockerize/php:7.2 .
12-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.3 -t letsdockerize/php:7.3 .
13-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.4 -t letsdockerize/php:7.4 .
14-
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.0 .
8+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=5.6 -t letsdockerize/php:5.6 .
9+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.0 -t letsdockerize/php:7.0 .
10+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.1 -t letsdockerize/php:7.1 .
11+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.2 -t letsdockerize/php:7.2 .
12+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.3 -t letsdockerize/php:7.3 .
13+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.4 -t letsdockerize/php:7.4 .
14+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.0 .
15+
docker build -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.1 .
1516

1617
build-php-nc:
17-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=5.6 -t letsdockerize/php:5.6 .
18-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.0 -t letsdockerize/php:7.0 .
19-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.1 -t letsdockerize/php:7.1 .
20-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.2 -t letsdockerize/php:7.2 .
21-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.3 -t letsdockerize/php:7.3 .
22-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.4 -t letsdockerize/php:7.4 .
23-
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.0 .
18+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=5.6 -t letsdockerize/php:5.6 .
19+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.0 -t letsdockerize/php:7.0 .
20+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.1 -t letsdockerize/php:7.1 .
21+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.2 -t letsdockerize/php:7.2 .
22+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.3 -t letsdockerize/php:7.3 .
23+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=7.4 -t letsdockerize/php:7.4 .
24+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.0 .
25+
docker build --no-cache -f ./Dockerfile --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.1 .
2426

2527
publish-php:
2628
docker push letsdockerize/php:5.6
@@ -30,3 +32,14 @@ publish-php:
3032
docker push letsdockerize/php:7.3
3133
docker push letsdockerize/php:7.4
3234
docker push letsdockerize/php:8.0
35+
docker push letsdockerize/php:8.1
36+
37+
dev:
38+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=5.6 -t letsdockerize/php:5.6 .
39+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=7.0 -t letsdockerize/php:7.0 .
40+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=7.1 -t letsdockerize/php:7.1 .
41+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=7.2 -t letsdockerize/php:7.2 .
42+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=7.3 -t letsdockerize/php:7.3 .
43+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=7.4 -t letsdockerize/php:7.4 .
44+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.0 .
45+
docker build -f ./Dockerfile-dev --build-arg PHP_TAG_VERSION=8.0 -t letsdockerize/php:8.1 .

0 commit comments

Comments
 (0)