Skip to content

Commit

Permalink
cakephp5 (#29)
Browse files Browse the repository at this point in the history
Upgrades to cakephp/app 5 and fixes docker build issue.
  • Loading branch information
cnizzardini authored Oct 1, 2023
1 parent bba84af commit dfea73c
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 3 deletions.
5 changes: 5 additions & 0 deletions .assets/bootstrap.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down
2 changes: 1 addition & 1 deletion .docker/php/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -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)
Expand Down

0 comments on commit dfea73c

Please sign in to comment.