From 9a872f743ecdd0ae93129398ac2456778c68d504 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Sun, 1 Oct 2023 11:55:03 -0400 Subject: [PATCH 1/6] cakephp5 --- .assets/bootstrap.php | 5 +++++ .docker/php/docker-entrypoint.sh | 2 +- Dockerfile | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.assets/bootstrap.php b/.assets/bootstrap.php index 927b26c..7cbbc34 100644 --- a/.assets/bootstrap.php +++ b/.assets/bootstrap.php @@ -44,6 +44,11 @@ use Cake\Routing\Router; use Cake\Utility\Security; +/** + * Load global functions. + */ +require CAKE . 'functions.php'; + /* * See https://github.com/josegonzalez/php-dotenv for API details. * diff --git a/.docker/php/docker-entrypoint.sh b/.docker/php/docker-entrypoint.sh index 66adbac..e8c774f 100644 --- a/.docker/php/docker-entrypoint.sh +++ b/.docker/php/docker-entrypoint.sh @@ -16,7 +16,7 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/cakephp' ]; then fi COMPOSER_MEMORY_LIMIT=-1 - composer create-project --prefer-dist --no-interaction cakephp/app:^4.4 . + composer create-project --prefer-dist --no-interaction cakephp/app:^5.0 . rm -rf .github cp config/.env.example config/.env cp config/app_local.example.php config/app_local.php diff --git a/Dockerfile b/Dockerfile index 5e1120f..d63b5f3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ENV HOST_OS=$HOST_OS # RUN if [[ "$ENV" != "prod" ]]; then \ apk add git \ - && apk add --no-cache --virtual .php-deps file re2c autoconf make zlib zlib-dev g++ curl \ + && apk add --update --no-cache --virtual .php-deps file re2c autoconf make zlib zlib-dev g++ curl linux-headers \ && pecl install xdebug \ && docker-php-ext-enable xdebug \ && apk del -f .php-deps; \ From 680b90a433d6aef8de1637316032e54e9b094229 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Sun, 1 Oct 2023 11:58:22 -0400 Subject: [PATCH 2/6] cakephp --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6c5cac6..38cc4a9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # 🍰 CakePHP Docker [![Build](https://github.com/cnizzardini/cakephp-docker/workflows/Build/badge.svg?branch=master)](https://github.com/cnizzardini/cakephp-docker/actions) -[![CakePHP](https://img.shields.io/badge/cakephp-4-red?logo=cakephp)](https://book.cakephp.org/4/en/index.html) +[![CakePHP](https://img.shields.io/badge/cakephp-5-red?logo=cakephp)](https://book.cakephp.org/5/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) From 45fa43a4aa1d996cecd9b00e680cca6f9b208344 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Fri, 22 Nov 2024 15:56:12 -0500 Subject: [PATCH 3/6] pin to ubuntu version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 74c88ca..e4268f8 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build: name: Docker Build - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 From 590c76dfd4405561f4d940d1d5e35c80298bedd4 Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Fri, 22 Nov 2024 15:56:44 -0500 Subject: [PATCH 4/6] pin to ubuntu version --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e4268f8..4eae4f2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build: name: Docker Build - runs-on: ubuntu-22.04 + runs-on: ubuntu-20.04 steps: - name: Checkout uses: actions/checkout@v2 From 990c77df15e2524755306a74cd55de357282dc8d Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Fri, 22 Nov 2024 15:59:41 -0500 Subject: [PATCH 5/6] testing --- .github/workflows/build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 4eae4f2..d44ae06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ on: [pull_request] jobs: build: name: Docker Build - runs-on: ubuntu-20.04 + runs-on: ubuntu-22.04 steps: - name: Checkout uses: actions/checkout@v2 @@ -14,11 +14,11 @@ jobs: cp .docker/php.env.development .docker/php.env cp .docker/mysql.env.development .docker/mysql.env - name: Pull images - run: docker-compose pull + run: docker compose pull - name: Build run: docker-compose build --build-arg UID=$(id -u) --build-arg ENV=dev - name: Start - run: docker-compose up -d + run: docker compose up -d - name: Wait for services run: sleep 10 - name: Check CakePHP Welcome Page From f288f9a43b88de1a13406db725bf8758f2a8de3f Mon Sep 17 00:00:00 2001 From: Chris Nizzardini Date: Fri, 22 Nov 2024 16:00:18 -0500 Subject: [PATCH 6/6] testing --- .github/workflows/build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d44ae06..aa1f275 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -16,7 +16,7 @@ jobs: - name: Pull images run: docker compose pull - name: Build - run: docker-compose build --build-arg UID=$(id -u) --build-arg ENV=dev + run: docker compose build --build-arg UID=$(id -u) --build-arg ENV=dev - name: Start run: docker compose up -d - name: Wait for services