Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 6f8445a

Browse files
Merge branch 'feature/7.3' into release/6.x
2 parents a9a6acb + 94ab815 commit 6f8445a

File tree

10 files changed

+24
-238
lines changed

10 files changed

+24
-238
lines changed

‎.gitlab-ci.yml‎

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ variables:
1313
before_script:
1414
- export ISOLATION=buildpipeline${CI_PIPELINE_ID}
1515
- export COMPOSE_PROJECT_NAME=${ISOLATION}${CI_BUILD_NAME}
16-
- export PHP_BASE_IMAGE_VERSION=7.2
16+
- export PHP_BASE_IMAGE_VERSION=7.3
1717
- export PHP_IMAGE_VERSION=$(git describe --always --dirty --tags)
1818
- export STACK_PHP_IMAGE=${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}
1919
- export REGISTRY_PHP_IMAGE=${PHP_IMAGE_NAME}:${CI_BUILD_REF_NAME}
@@ -34,11 +34,6 @@ build:php:
3434
script:
3535
- docker-compose build --pull php
3636

37-
build:php-alpine:
38-
stage: php-build
39-
script:
40-
- docker-compose build --pull php-alpine
41-
4237
test:php:
4338
stage: php-test
4439
script:
@@ -48,15 +43,6 @@ test:php:
4843
- sh test/debug.sh
4944
- docker-compose run --rm php php /test/requirements.php
5045

51-
test:php-alpine:
52-
stage: php-test
53-
script:
54-
- export PHP_SERVICE=php-alpine
55-
- sh test/prod.sh
56-
- sh test/dev.sh
57-
- sh test/debug.sh
58-
- docker-compose run --rm php-alpine php /test/requirements.php
59-
6046
test:php:allow-fail:
6147
stage: php-test
6248
script:
@@ -80,8 +66,6 @@ release:php:latest:
8066
- docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
8167
- docker tag ${STACK_PHP_IMAGE} ${REGISTRY_PHP_IMAGE_LATEST}
8268
- docker push ${REGISTRY_PHP_IMAGE_LATEST}
83-
- docker tag ${STACK_PHP_IMAGE}-alpine ${REGISTRY_PHP_IMAGE_LATEST}-alpine
84-
- docker push ${REGISTRY_PHP_IMAGE_LATEST}-alpine
8569

8670
release:php:tags:
8771
stage: php-release
@@ -91,10 +75,6 @@ release:php:tags:
9175
- docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
9276
- docker tag ${STACK_PHP_IMAGE} ${REGISTRY_PHP_IMAGE}
9377
- docker push ${REGISTRY_PHP_IMAGE}
94-
- docker tag ${STACK_PHP_IMAGE}-alpine ${REGISTRY_PHP_IMAGE}-alpine
95-
- docker push ${REGISTRY_PHP_IMAGE}-alpine
96-
97-
9878

9979
build:php-nginx:
10080
stage: nginx-build
@@ -103,23 +83,11 @@ build:php-nginx:
10383
# use locally built image
10484
- docker-compose build php-nginx
10585

106-
build:php-alpine-nginx:
107-
stage: nginx-build
108-
script:
109-
- cd nginx
110-
# use locally built image
111-
- docker-compose build php-alpine-nginx
112-
11386
test:php-nginx:
11487
stage: nginx-test
11588
script:
11689
- docker-compose run --rm php-nginx nginx -v
11790

118-
test:php-alpine-nginx:
119-
stage: nginx-test
120-
script:
121-
- docker-compose run --rm php-alpine-nginx nginx -v
122-
12391
release:nginx:latest:
12492
stage: nginx-release
12593
only:
@@ -128,8 +96,6 @@ release:nginx:latest:
12896
- docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
12997
- docker tag ${STACK_PHP_IMAGE}-nginx ${REGISTRY_PHP_IMAGE_LATEST}-nginx
13098
- docker push ${REGISTRY_PHP_IMAGE_LATEST}-nginx
131-
- docker tag ${STACK_PHP_IMAGE}-alpine-nginx ${REGISTRY_PHP_IMAGE_LATEST}-alpine-nginx
132-
- docker push ${REGISTRY_PHP_IMAGE_LATEST}-alpine-nginx
13399

134100
release:nginx:tags:
135101
stage: nginx-release
@@ -139,5 +105,3 @@ release:nginx:tags:
139105
- docker login --username ${REGISTRY_USER} --password ${REGISTRY_PASS} ${REGISTRY_HOST}
140106
- docker tag ${STACK_PHP_IMAGE}-nginx ${REGISTRY_PHP_IMAGE}-nginx
141107
- docker push ${REGISTRY_PHP_IMAGE}-nginx
142-
- docker tag ${STACK_PHP_IMAGE}-alpine-nginx ${REGISTRY_PHP_IMAGE}-alpine-nginx
143-
- docker push ${REGISTRY_PHP_IMAGE}-alpine-nginx

‎Makefile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
build:
22
docker-compose build --pull php
33
docker-compose build --pull php-nginx
4-
docker-compose build --pull php-alpine
5-
docker-compose build --pull php-alpine-nginx
64

75
push-all:
86
git remote | xargs -L1 git push --all
97

108
lint:
119
docker run -it --rm -v "$(PWD)/php/Dockerfile-fpm":/Dockerfile:ro redcoolbeans/dockerlint
12-
docker run -it --rm -v "$(PWD)/php/Dockerfile-fpm-alpine":/Dockerfile:ro redcoolbeans/dockerlint

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@ Supported tags and respective `Dockerfile` links
33

44
- `7.x-fpm-x.x`, `latest` ([Dockerfile](php/Dockerfile-fpm))
55
- `7.x-fpm-x.x-nginx`, `latest-nginx` ([Dockerfile](nginx/Dockerfile-fpm-nginx))
6-
- `7.x-fpm-x.x-alpine`, `latest-alpine` ([Dockerfile](php/Dockerfile-fpm))
7-
- `7.x-fpm-x.x-alpine-nginx`, `latest-alpine-nginx` ([Dockerfile](nginx/Dockerfile-fpm-alpine-nginx))
86

97
*`latest` images are currently built based on the `release/4.x` branch*
108

9+
*Alpine support has been dropped since PHP 7.3*
10+
1111
:information_source: See repository tags for full version numbers
1212

1313
See all available [image tags](https://hub.docker.com/r/dmstr/php-yii2/tags/)
@@ -51,7 +51,7 @@ Features
5151
- opcache
5252
- pdo_mysql
5353
- pdo_pgsql
54-
- memcache - *Alpine only*
54+
- memcache
5555
- xdebug - *installed, but not loaded by default*
5656

5757
Configuration

‎docker-compose.yml‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -27,25 +27,3 @@ services:
2727
ports:
2828
- 80
2929
- 443
30-
31-
php-alpine:
32-
build:
33-
dockerfile: Dockerfile-fpm-alpine
34-
context: 'php'
35-
args:
36-
- PHP_BASE_IMAGE_VERSION=${PHP_BASE_IMAGE_VERSION}
37-
image: ${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}-alpine
38-
volumes:
39-
- ./test:/test
40-
php-alpine-nginx:
41-
build:
42-
dockerfile: Dockerfile-fpm-alpine-nginx
43-
context: 'nginx'
44-
args:
45-
- PHP_IMAGE_VERSION=${PHP_IMAGE_VERSION}
46-
image: ${PHP_IMAGE_NAME}:${PHP_IMAGE_VERSION}-alpine-nginx
47-
volumes:
48-
- ./test/app/web:/app/web
49-
ports:
50-
- 80
51-
- 443

‎nginx/Dockerfile-fpm-alpine-nginx‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎php/Dockerfile-fpm‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,19 @@ RUN apt-get update && \
1515
apt-get -y install \
1616
g++ \
1717
git \
18+
bash-completion \
1819
curl \
1920
imagemagick \
2021
libfreetype6-dev \
2122
libcurl3-dev \
2223
libicu-dev \
23-
libmcrypt-dev \
2424
libfreetype6-dev \
2525
libjpeg-dev \
2626
libjpeg62-turbo-dev \
2727
libmagickwand-dev \
28-
libmcrypt-dev \
2928
libpq-dev \
3029
libpng-dev \
30+
libzip-dev \
3131
zlib1g-dev \
3232
mysql-client \
3333
openssh-client \
@@ -63,9 +63,8 @@ RUN docker-php-ext-configure gd \
6363
# Install PECL extensions
6464
# see http://stackoverflow.com/a/8154466/291573) for usage of `printf`
6565
RUN printf "\n" | pecl install \
66-
apcu-5.1.3 \
67-
imagick \
68-
mcrypt-1.0.0 && \
66+
apcu-5.1.14 \
67+
imagick && \
6968
docker-php-ext-enable \
7069
apcu \
7170
imagick
@@ -74,7 +73,7 @@ RUN printf "\n" | pecl install \
7473
RUN cd /tmp && \
7574
git clone git://github.com/xdebug/xdebug.git && \
7675
cd xdebug && \
77-
git checkout 52adff7539109db592d07d3f6c325f6ee2a7669f && \
76+
git checkout tags/2.7.0beta1 && \
7877
phpize && \
7978
./configure --enable-xdebug && \
8079
make && \
@@ -88,6 +87,10 @@ RUN npm install -g \
8887
uglify-js \
8988
uglifycss
9089

90+
# Install Yii framework bash autocompletion
91+
RUN curl -L https://raw.githubusercontent.com/yiisoft/yii2/master/contrib/completion/bash/yii \
92+
-o /etc/bash_completion.d/yii
93+
9194
ENV PHP_USER_ID=33 \
9295
PHP_ENABLE_XDEBUG=0 \
9396
VERSION_COMPOSER_ASSET_PLUGIN=^1.4.3 \

‎php/Dockerfile-fpm-alpine‎

Lines changed: 0 additions & 137 deletions
This file was deleted.

‎php/image-files/root/.bashrc‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,16 @@ cat <<'MSG'
1414
1515
Docker image dmstr/php-yii2
1616
17-
Available commands:
18-
19-
composer
20-
codecept
21-
phpunit
22-
yii
17+
Console commands: composer, codecept, phpunit, yii
2318
2419
MSG
20+
21+
echo "PHP version: ${PHP_VERSION}"
22+
23+
if ! shopt -oq posix; then
24+
if [ -f /usr/share/bash-completion/bash_completion ]; then
25+
. /usr/share/bash-completion/bash_completion
26+
elif [ -f /etc/bash_completion.d/yii ]; then
27+
. /etc/bash_completion.d/yii
28+
fi
29+
fi

‎php/image-files/usr/local/etc/php/conf.d/mcrypt.ini‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /