diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index c57f5c2..2eb8353 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -24,7 +24,7 @@ jobs: fi TAGS="${DOCKER_IMAGE}:${VERSION}" if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:4.4-latest" + TAGS="$TAGS,${DOCKER_IMAGE}:4.2-latest" fi echo ::set-output name=tags::${TAGS} - diff --git a/Dockerfile b/Dockerfile index d63b5f3..b85d653 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,8 @@ # # container # @see https://hub.docker.com/repository/docker/cnizzardini/php-fpm-alpine -# @see https://github.com/cnizzardini/php-fpm-alpine/tree/php-8.1 -FROM cnizzardini/php-fpm-alpine:8.1-latest AS cakephp_php +# @see https://github.com/cnizzardini/php-fpm-alpine/tree/php-8.0 +FROM cnizzardini/php-fpm-alpine:8.0-latest AS cakephp_php ARG ENV=prod ARG UID=1000 diff --git a/README.md b/README.md index 6c5cac6..9b937f8 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ [![CakePHP](https://img.shields.io/badge/cakephp-4-red?logo=cakephp)](https://book.cakephp.org/4/en/index.html) [![Docker](https://img.shields.io/badge/docker-ffffff.svg?logo=docker)](.docker) [![Kubernetes](https://img.shields.io/badge/kubernetes-D3D3D3.svg?logo=kubernetes)](.kube) -[![PHP](https://img.shields.io/badge/php-8.1-8892BF.svg?logo=php)](https://hub.docker.com/_/php) +[![PHP](https://img.shields.io/badge/php-8.0-8892BF.svg?logo=php)](https://hub.docker.com/_/php) [![NGINX](https://img.shields.io/badge/nginx-1.19-009639.svg?logo=nginx)](https://hub.docker.com/_/nginx) [![MySQL](https://img.shields.io/badge/mysql-8-00758F.svg?logo=mysql)](https://hub.docker.com/_/mysql) @@ -17,11 +17,11 @@ or [DevilBox](https://devilbox.readthedocs.io/en/latest/examples/setup-cakephp.h - [Docker 20](https://docs.docker.com/engine/release-notes/) or higher - Make -| Service | Host:Port | Docker Host | Image | -|------------------------|----------------|-------------|----------------------------------------------------------------------------------------------| -| PHP8.1-FPM w/ Xdebug 3 | - | php | [cnizzardini/php-fpm-alpine:8.1-latest](https://hub.docker.com/r/cnizzardini/php-fpm-alpine) | -| NGINX 1.19 | localhost:8080 | web | [nginx:1.19-alpine](https://hub.docker.com/_/nginx) | -| MySQL 8 | localhost:3607 | db | [library/mysql:8](https://hub.docker.com/_/mysql) | +| Service | Host:Port | Docker Host | Image | +| ----------- | ----------- | ----------- | ----------- | +| PHP8.0-FPM w/ Xdebug 3 | - | php | [cnizzardini/php-fpm-alpine:8.0-latest](https://hub.docker.com/r/cnizzardini/php-fpm-alpine) | +| NGINX 1.19 | localhost:8080 | web | [nginx:1.19-alpine](https://hub.docker.com/_/nginx) | +| MySQL 8 | localhost:3607 | db | [library/mysql:8](https://hub.docker.com/_/mysql) | - [Installation](#installation) @@ -65,26 +65,26 @@ After install browse to [http://localhost:8080](http://localhost:8080) to see th A [Makefile](Makefile) is provided with some optional commands for your convenience. Please review the Makefile as these commands are not exact aliases of docker-compose commands. -| Make Command | Description | -|-------------------------|-----------------------------------------------------------------------------------------| -| `make` | Shows all make target commands | -| `make init` | Runs docker build, docker-compose up, and copies over env files | -| `make init.nocache` | Same as make.init but builds with --no-cache | -| `make start` | Starts services `docker-compose -f .docker/docker-compose.yml start` | -| `make stop` | Stops services `docker-compose -f .docker/docker-compose.yml stop` | -| `make up` | Create and start containers `docker-compose -f .docker/docker-compose.yml up -d` | -| `make down` | Take down and remove all containers `docker-compose -f .docker/docker-compose.yml down` | -| `make restart` | Restarts services `docker-compose -f .docker/docker-compose.yml restart` | -| `make php.sh` | PHP terminal `docker exec -it --user cakephp sh` | -| `make php.restart` | Restarts the PHP container | -| `make db.sh` | DB terminal `docker exec -it sh` | -| `make db.mysql` | MySQL terminal `mysql -u root -h 0.0.0.0 -p --port 3307` | -| `make web.sh` | Web terminal `docker exec -it sh` | -| `make xdebug.on` | Restarts PHP container with xdebug.mode set to debug,coverage | -| `make xdebug.off` | Restarts PHP container with xdebug.mode set to off | -| `make composer.install` | `docker exec composer install --no-interaction` | -| `make composer.test` | `docker exec composer test` | -| `make composer.check` | `docker exec composer check` | +| Make Command | Description | +| ----------- | ----------- | +| `make` | Shows all make target commands | +| `make init` | Runs docker build, docker-compose up, and copies over env files | +| `make init.nocache` | Same as make.init but builds with --no-cache | +| `make start` | Starts services `docker-compose -f .docker/docker-compose.yml start` | +| `make stop` | Stops services `docker-compose -f .docker/docker-compose.yml stop` | +| `make up` | Create and start containers `docker-compose -f .docker/docker-compose.yml up -d` | +| `make down` | Take down and remove all containers `docker-compose -f .docker/docker-compose.yml down` | +| `make restart` | Restarts services `docker-compose -f .docker/docker-compose.yml restart` | +| `make php.sh` | PHP terminal `docker exec -it --user cakephp sh` | +| `make php.restart` | Restarts the PHP container | +| `make db.sh` | DB terminal `docker exec -it sh` | +| `make db.mysql` | MySQL terminal `mysql -u root -h 0.0.0.0 -p --port 3307` | +| `make web.sh` | Web terminal `docker exec -it sh` | +| `make xdebug.on` | Restarts PHP container with xdebug.mode set to debug,coverage | +| `make xdebug.off` | Restarts PHP container with xdebug.mode set to off | +| `make composer.install` | `docker exec composer install --no-interaction` | +| `make composer.test` | `docker exec composer test` | +| `make composer.check` | `docker exec composer check` | ### PHP