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 34681b7

Browse files
dropped Alpine support
1 parent 9cb069c commit 34681b7

File tree

6 files changed

+3
-226
lines changed

6 files changed

+3
-226
lines changed

‎.gitlab-ci.yml‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -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/)
@@ -48,7 +48,7 @@ Features
4848
- opcache
4949
- pdo_mysql
5050
- pdo_pgsql
51-
- memcache - *Alpine only*
51+
- memcache
5252
- xdebug - *installed, but not loaded by default*
5353

5454
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 & 24 deletions
This file was deleted.

‎php/Dockerfile-fpm-alpine‎

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

0 commit comments

Comments
(0)

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