Skip to content

Commit d254d50

Browse files
carlbastoscarlbastos
committed
CR corrections.
1 parent dca1b48 commit d254d50

13 files changed

Lines changed: 196 additions & 12 deletions

File tree

‎.github/workflows/docker-description.yml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Sync Docker Hub Description
2+
3+
on:
4+
push:
5+
branches:
6+
- master
7+
paths:
8+
- README.md
9+
- .github/workflows/docker-description.yml
10+
11+
jobs:
12+
docker-description:
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v2
16+
17+
- name: Sync Docker Hub Description
18+
uses: peter-evans/dockerhub-description@v2
19+
env:
20+
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
21+
DOCKERHUB_PASSWORD: ${{ secrets.DOCKERHUB_PASSWORD }}
22+
DOCKERHUB_REPOSITORY: kooldev/wordpress

.github/docker.yml renamed to .github/workflows/docker.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: default
10+
version: [ 7.4-fpm-alpine, 7.3-fpm-alpine, 7.2-fpm-alpine, 7.1-fpm-alpine ]
1111

1212
steps:
1313
- name: Checkout code
@@ -18,7 +18,9 @@ jobs:
1818

1919
- name: Test docker images
2020
run: |
21+
docker run kooldev/wordpress:${{ matrix.version }} php -v
2122
docker run kooldev/wordpress:${{ matrix.version }} php /usr/src/wordpress/index.php
23+
2224
- name: Push to Hub
2325
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
2426
env:

‎7.1-fpm-alpine/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM wordpress:php7.1-fpm-alpine
2+
3+
ENV PHP_MEMORY_LIMIT=256M \
4+
PHP_UPLOAD_MAX_FILESIZE=50M \
5+
PHP_POST_MAX_SIZE=50M \
6+
PHP_MAX_EXECUTION_TIME=30
7+
8+
ARG DOCKERIZE_VERSION=v0.6.1
9+
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
10+
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
11+
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
12+
&& cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
13+
14+
COPY kool.ini /kool/kool.tmpl
15+
16+
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "docker-entrypoint.sh" ]

default/kool.ini renamed to 7.1-fpm-alpine/kool.ini

File renamed without changes.

‎7.2-fpm-alpine/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM wordpress:php7.2-fpm-alpine
2+
3+
ENV PHP_MEMORY_LIMIT=256M \
4+
PHP_UPLOAD_MAX_FILESIZE=50M \
5+
PHP_POST_MAX_SIZE=50M \
6+
PHP_MAX_EXECUTION_TIME=30
7+
8+
ARG DOCKERIZE_VERSION=v0.6.1
9+
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
10+
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
11+
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
12+
&& cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
13+
14+
COPY kool.ini /kool/kool.tmpl
15+
16+
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "docker-entrypoint.sh" ]

‎7.2-fpm-alpine/kool.ini‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[PHP]
2+
3+
; Maximum amount of memory a script may consume
4+
; http://php.net/memory-limit
5+
memory_limit = {{ .Env.PHP_MEMORY_LIMIT }}
6+
7+
; Maximum allowed size for uploaded files.
8+
; http://php.net/upload-max-filesize
9+
upload_max_filesize = {{ .Env.PHP_UPLOAD_MAX_FILESIZE }}
10+
11+
; Maximum size of POST data that PHP will accept.
12+
; Its value may be 0 to disable the limit. It is ignored if POST data reading
13+
; is disabled through enable_post_data_reading.
14+
; http://php.net/post-max-size
15+
post_max_size = {{ .Env.PHP_POST_MAX_SIZE }}
16+
17+
; Maximum execution time of each script, in seconds
18+
; http://php.net/max-execution-time
19+
; Note: This directive is hardcoded to 0 for the CLI SAPI
20+
max_execution_time = {{ .Env.PHP_MAX_EXECUTION_TIME }}

‎7.3-fpm-alpine/Dockerfile‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
FROM wordpress:php7.3-fpm-alpine
2+
3+
ENV PHP_MEMORY_LIMIT=256M \
4+
PHP_UPLOAD_MAX_FILESIZE=50M \
5+
PHP_POST_MAX_SIZE=50M \
6+
PHP_MAX_EXECUTION_TIME=30
7+
8+
ARG DOCKERIZE_VERSION=v0.6.1
9+
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
10+
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
11+
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
12+
&& cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
13+
14+
COPY kool.ini /kool/kool.tmpl
15+
16+
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "docker-entrypoint.sh" ]

‎7.3-fpm-alpine/kool.ini‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[PHP]
2+
3+
; Maximum amount of memory a script may consume
4+
; http://php.net/memory-limit
5+
memory_limit = {{ .Env.PHP_MEMORY_LIMIT }}
6+
7+
; Maximum allowed size for uploaded files.
8+
; http://php.net/upload-max-filesize
9+
upload_max_filesize = {{ .Env.PHP_UPLOAD_MAX_FILESIZE }}
10+
11+
; Maximum size of POST data that PHP will accept.
12+
; Its value may be 0 to disable the limit. It is ignored if POST data reading
13+
; is disabled through enable_post_data_reading.
14+
; http://php.net/post-max-size
15+
post_max_size = {{ .Env.PHP_POST_MAX_SIZE }}
16+
17+
; Maximum execution time of each script, in seconds
18+
; http://php.net/max-execution-time
19+
; Note: This directive is hardcoded to 0 for the CLI SAPI
20+
max_execution_time = {{ .Env.PHP_MAX_EXECUTION_TIME }}

default/Dockerfile renamed to 7.4-fpm-alpine/Dockerfile

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,14 @@ FROM wordpress:php7.4-fpm-alpine
33
ENV PHP_MEMORY_LIMIT=256M \
44
PHP_UPLOAD_MAX_FILESIZE=50M \
55
PHP_POST_MAX_SIZE=50M \
6-
PHP_MAX_EXECUTION_TIME=300
6+
PHP_MAX_EXECUTION_TIME=30
77

88
ARG DOCKERIZE_VERSION=v0.6.1
99
RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
1010
&& tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
11-
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
11+
&& rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
12+
&& cp /usr/local/etc/php/php.ini-production /usr/local/etc/php/php.ini
1213

1314
COPY kool.ini /kool/kool.tmpl
1415

1516
ENTRYPOINT [ "dockerize", "-template", "/kool/kool.tmpl:/usr/local/etc/php/conf.d/kool.ini", "docker-entrypoint.sh" ]
16-
17-
CMD ["php-fpm"]

‎7.4-fpm-alpine/kool.ini‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
[PHP]
2+
3+
; Maximum amount of memory a script may consume
4+
; http://php.net/memory-limit
5+
memory_limit = {{ .Env.PHP_MEMORY_LIMIT }}
6+
7+
; Maximum allowed size for uploaded files.
8+
; http://php.net/upload-max-filesize
9+
upload_max_filesize = {{ .Env.PHP_UPLOAD_MAX_FILESIZE }}
10+
11+
; Maximum size of POST data that PHP will accept.
12+
; Its value may be 0 to disable the limit. It is ignored if POST data reading
13+
; is disabled through enable_post_data_reading.
14+
; http://php.net/post-max-size
15+
post_max_size = {{ .Env.PHP_POST_MAX_SIZE }}
16+
17+
; Maximum execution time of each script, in seconds
18+
; http://php.net/max-execution-time
19+
; Note: This directive is hardcoded to 0 for the CLI SAPI
20+
max_execution_time = {{ .Env.PHP_MAX_EXECUTION_TIME }}

0 commit comments

Comments
 (0)