Skip to content

Commit 5d2928e

Browse files
authored
Merge pull request #3 from carlbastos/development
Fixes issue #2
2 parents 5f3ac8c + 1661724 commit 5d2928e

6 files changed

Lines changed: 17 additions & 3 deletions

File tree

.github/workflows/docker.yml

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,19 @@ jobs:
1616
- name: Build image
1717
run: docker build --pull -t kooldev/wordpress:${{ matrix.version }} ${{ matrix.version }}
1818

19-
- name: Test docker images
19+
- name: Test docker images default command
2020
run: |
21-
docker run kooldev/wordpress:${{ matrix.version }} php -v
22-
docker run kooldev/wordpress:${{ matrix.version }} php /usr/src/wordpress/index.php
21+
docker run -d --name cicdwp-${{ matrix.version }} kooldev/wordpress:${{ matrix.version }}
22+
docker inspect cicdwp-${{ matrix.version }} --format='{{.State.ExitCode}}'
23+
if [ $? -eq 0 ]; then
24+
docker stop cicdwp-${{ matrix.version }}
25+
fi
26+
27+
- name: Test docker images PHP executable
28+
run: docker run kooldev/wordpress:${{ matrix.version }} php -v
29+
30+
- name: Test docker images wordpress code
31+
run: docker run kooldev/wordpress:${{ matrix.version }} php /usr/src/wordpress/index.php
2332

2433
- name: Push to Hub
2534
if: github.event_name == 'push' && github.ref == 'refs/heads/master'

7.1-fpm-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
1414
COPY kool.ini /kool/kool.tmpl
1515

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

7.2-fpm-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
1414
COPY kool.ini /kool/kool.tmpl
1515

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

7.3-fpm-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
1414
COPY kool.ini /kool/kool.tmpl
1515

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

7.4-fpm-alpine/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
1414
COPY kool.ini /kool/kool.tmpl
1515

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

template/Dockerfile.blade.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@
1414
COPY kool.ini /kool/kool.tmpl
1515

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

0 commit comments

Comments
 (0)