Skip to content

Commit 5bc2c19

Browse files
authored
Merge pull request #4 from kool-dev/kooldev-php
Using kool/php as base
2 parents 7f56e72 + c93efd1 commit 5bc2c19

47 files changed

Lines changed: 4002 additions & 736 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/docker.yml

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
name: CI
22

3-
on: [push, pull_request]
3+
on: [push]
44

55
jobs:
66
build:
77
runs-on: ubuntu-latest
88
strategy:
99
matrix:
10-
version: [ 7.1, 7.2, 7.3, 7.4 ]
10+
version: [ 7.2, 7.3, 7.4 ]
1111

1212
steps:
1313
- name: Checkout code
@@ -16,24 +16,38 @@ jobs:
1616
- name: Build image
1717
run: |
1818
docker build --pull -t kooldev/wordpress:${{ matrix.version }} ${{ matrix.version }}
19+
docker build --pull -t kooldev/wordpress:${{ matrix.version }}-prod ${{ matrix.version }}-prod
1920
docker build -t kooldev/wordpress:${{ matrix.version }}-nginx ${{ matrix.version }}-nginx
21+
docker build -t kooldev/wordpress:${{ matrix.version }}-nginx-prod ${{ matrix.version }}-nginx-prod
2022
2123
- name: Test docker images PHP executable
2224
run: |
2325
docker run kooldev/wordpress:${{ matrix.version }} php -v
26+
docker run kooldev/wordpress:${{ matrix.version }}-prod php -v
27+
2428
docker run kooldev/wordpress:${{ matrix.version }}-nginx php -v
29+
docker run kooldev/wordpress:${{ matrix.version }}-nginx nginx -v
30+
docker run kooldev/wordpress:${{ matrix.version }}-nginx supervisord version
31+
32+
docker run kooldev/wordpress:${{ matrix.version }}-nginx-prod php -v
33+
docker run kooldev/wordpress:${{ matrix.version }}-nginx-prod nginx -v
34+
docker run kooldev/wordpress:${{ matrix.version }}-nginx-prod supervisord version
2535
2636
- name: Test docker images wordpress code
2737
run: |
28-
docker run kooldev/wordpress:${{ matrix.version }} php /usr/src/wordpress/index.php
29-
docker run kooldev/wordpress:${{ matrix.version }}-nginx php /usr/src/wordpress/index.php
38+
docker run kooldev/wordpress:${{ matrix.version }} php /kool/wordpress/index.php
39+
docker run kooldev/wordpress:${{ matrix.version }}-prod php /kool/wordpress/index.php
40+
docker run kooldev/wordpress:${{ matrix.version }}-nginx php /kool/wordpress/index.php
41+
docker run kooldev/wordpress:${{ matrix.version }}-nginx-prod php /kool/wordpress/index.php
3042
3143
- name: Push to Hub
32-
if: github.event_name == 'push' && github.ref == 'refs/heads/master'
44+
if: github.ref == 'refs/heads/master' && github.repository == 'kool-dev/docker-wordpress'
3345
env:
3446
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
3547
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
3648
run: |
3749
echo $DOCKER_PASSWORD | docker login -u $DOCKER_USERNAME --password-stdin
3850
docker push kooldev/wordpress:${{ matrix.version }}
51+
docker push kooldev/wordpress:${{ matrix.version }}-prod
3952
docker push kooldev/wordpress:${{ matrix.version }}-nginx
53+
docker push kooldev/wordpress:${{ matrix.version }}-nginx-prod

7.1-nginx/Dockerfile

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

7.1-nginx/default.tmpl

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

7.1-nginx/supervisor.conf

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

7.1/Dockerfile

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

7.1/kool.ini

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

7.2-nginx-prod/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
FROM wordpress:php7.2-fpm-alpine as wordpress
2+
FROM kooldev/php:7.2-nginx-prod
3+
4+
ENV NGINX_ROOT=/app
5+
6+
COPY --from=wordpress --chown=kool:kool /usr/src/wordpress /kool/wordpress
7+
COPY --from=wordpress --chown=kool:kool /var/www/html/wp-content /app/wp-content
8+
COPY entrypoint /kool/entrypoint
9+
10+
RUN chmod -R 777 wp-content && chmod +x /kool/entrypoint

0 commit comments

Comments
 (0)