Merge upstream (#5)

Author: cnizzardini

.docker/nginx/default.conf

@@ -5,15 +5,15 @@ server {
     index index.php;
 
     location / {
-      try_files $uri /index.php?$args;
+        try_files $uri $uri/ /index.php?$args;
     }
 
     location ~ \.php$ {
+        try_files $uri =404;
+        include fastcgi_params;
         fastcgi_pass php:9000;
         fastcgi_index index.php;
+        fastcgi_intercept_errors on;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
-        fastcgi_buffers 16 16k;
-        fastcgi_buffer_size 32k;
-        include fastcgi_params;
     }
-}
+}

.docker/php/docker-entrypoint.sh

@@ -43,16 +43,28 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/cakephp' ]; then
         bin/cake mixerapi install --auto Y
     fi
 
+    echo "ENV: $APP_ENV"
     if [ "$APP_ENV" != 'prod' ]; then
         composer install --prefer-dist --no-interaction
     fi
 
     mkdir -p logs tmp
-    setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX logs
-    setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX tmp
-    setfacl -R -m g:nginx:rwX /srv/app
+
+    echo "HOST OS: $HOST_OS"
+    if [[ $HOST_OS == *"Linux"* ]]; then
+        echo "Setting ACLs..."
+        setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX logs
+        setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX tmp
+        setfacl -R -m g:nginx:rwX /srv/app
+    fi
+
+    echo "setting ownership..."
     chown -R cakephp:www-data .
+
+    echo "setting permissions..."
     chmod 774 -R .
+
+    echo "waiting for fpm..."
 fi
 
 exec docker-php-entrypoint "$@"

.github/workflows/image.yml.template

@@ -1,9 +1,9 @@
 name: Image
 
-on:
-  create:
-    tags:
-      - "v*.*.*"
+#on:
+#  create:
+#    tags:
+#      - "v*.*.*"
 
 jobs:
   build:

Dockerfile

@@ -6,7 +6,9 @@ FROM cnizzardini/php-fpm-alpine:8.0-latest AS cakephp_php
 
 ARG ENV=prod
 ARG UID=1000
+ARG HOST_OS=Linux
 ENV APP_ENV=$ENV
+ENV HOST_OS=$HOST_OS
 
 #
 # dev/test depdencies

Makefile

@@ -1,4 +1,4 @@
-SHELL=/bin/bash
+SHELL 			:= /bin/bash # set shell based on host os, use /bin/zsh for mac
 .DEFAULT_GOAL   := help
 
 #
@@ -107,12 +107,12 @@ help:
 init: do.copy
 	@printf $(DOCKER_ICO) && printf "$(GOOD)running docker build and up $(E)"
 	@mkdir -p app && touch app/.gitkeep
-	@docker-compose build --build-arg UID=$(shell id -u) --build-arg ENV=dev
+	@docker-compose build --build-arg UID=$(shell id -u) --build-arg ENV=dev --build-arg HOST_OS=$(shell uname -s)
 	@$(DC_UP)
 init.nocache: do.copy
 	@printf $(DOCKER_ICO) && printf "$(GOOD)running docker build --no-cache and up $(E)"
 	@mkdir -p app && touch app/.gitkeep
-	@docker-compose build --build-arg UID=$(shell id -u) --build-arg ENV=dev --no-cache
+	@docker-compose build --build-arg UID=$(shell id -u) --build-arg ENV=dev --no-cache --build-arg HOST_OS=$(shell uname -s)
 	@$(DC_UP)
 
 #

README.md

@@ -14,19 +14,26 @@ based on the official [cakephp/app 4.2](https://github.com/cakephp/app) template
 
 This project has been forked from [cnizzardini/cakephp-docker](https://github.com/cnizzardini/cakephp-docker).
 
+#### Dependencies:
+
+- [Docker 20](https://docs.docker.com/engine/release-notes/) or higher
+- Make
+
 | Service                   | Host:Port         | Docker Host   | Image   |
 | -----------               | -----------       | -----------   | -----------   |
-| PHP7.4-FPM w/ Xdebug 3    | -                 | php           | [cnizzardini/php-fpm-alpine:7.4-latest](https://hub.docker.com/r/cnizzardini/php-fpm-alpine) |
+| 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)
-- [Mac OS Notes](#mac-notes)
+- [MacOS Notes](#mac-notes)
 - [Usage](#usage)
   - [PHP](#php)
   - [MySQL](#mysql)
   - [NGINX](#nginx)
   - [Xdebug](#xdebug)
+- [Reinstall](#reinstall)
 
 ## Installation
 
@@ -146,4 +153,9 @@ Go to `File > Settings > Languages & Frameworks > PHP > Servers`
 - Debugger: `Xdebug`
 - Use path mappings: `Enable`
 
-Map your projects app directory to the absolute path on the docker container `/srv/app`
+Map your project's app directory to the absolute path on the docker container `/srv/app`
+
+## Reinstall
+
+To completely reinstall delete existing containers and images, then remove the `app/` directory and run `make init`
+again.