refactor

Author: cnizzardini

.docker/.dockerignore

@@ -8,21 +8,45 @@ fi
 
 if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/cakephp' ]; then
 
+    mkdir -p logs tmp
     chown -R cakephp:www-data .
+    chmod 774 -R .
 
-    #if [ "$APP_ENV" = 'prod' ]; then
-    #    composer install --prefer-dist --no-interaction --no-dev
-    #else
-    #    composer install --prefer-dist --no-interaction
-    #fi
+    # The first time volumes are mounted, the project needs to be recreated
+    if [ ! -f composer.json ]; then
 
-    mkdir -p logs tmp/cache/models tmp/cache/models/persistent tmp/sessions tmp/tests
-    chown -R cakephp:www-data logs tmp
-    chmod 775 -R logs tmp
-    setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX logs
-    setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX tmp
-    #bin/cake cache clear_all
+        if [ -f .gitkeep ]; then
+            rm .gitkeep # create project fails if directory is not empty
+        fi
+
+        COMPOSER_MEMORY_LIMIT=-1
+        composer create-project --prefer-dist --no-interaction cakephp/app:^4.2 .
+        rm -rf .github
+        cp config/.env.example config/.env
+        cp config/app_local.example.php config/app_local.php
+        mv ../.assets/bootstrap.php config/bootstrap.php
+
+        sed -i '/export APP_NAME/c\export APP_NAME="cakephp"' config/.env
+
+        salt=$(cat /dev/urandom | LC_CTYPE=C tr -dc 'a-zA-Z0-9' | fold -w 32 | head -n 1)
+        sed -i '/export SECURITY_SALT/c\export SECURITY_SALT="'$salt'"' config/.env
+
+        touch .gitkeep
 
+        composer require mixerapi/mixerapi
+        bin/cake plugin load MixerApi
+        bin/cake mixerapi install --auto Y
+    fi
+
+    if [ "$APP_ENV" != 'prod' ]; then
+        composer install --prefer-dist --no-interaction
+    fi
+
+    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
+    chown -R cakephp:www-data .
+    chmod 774 -R .
 fi
 
 exec docker-php-entrypoint "$@"

.docker/php/docker-entrypoint.sh

@@ -0,0 +1,13 @@
+app/vendor/
+app/logs/
+app/tmp/
+app/config/.env
+app/config/app_local.php
+app/.git
+app/.cache
+app/.editorconfig
+app/.gitattributes
+app/.gitignore
+app/.gitkeep
+app/webroot/swagger.json
+app/plugins/AdminApi/webroot/swagger.json

.dockerignore

@@ -3,13 +3,25 @@
 This is provided as a starter/example setup. You can run kubernetes locally with an orchestration tool such as
 [minikube](https://minikube.sigs.k8s.io/docs/) and [kubectl](https://kubernetes.io/docs/tasks/tools/).
 
+Starting minikube:
+
 ```console
 minikube start
+```
+
+Apply configs:
+
+```console
 kubectl apply -f .kube/namespace.yaml
 kubectl apply -f .kube/mysql-secret.yaml
 kubectl apply -f .kube/php-secret.yaml
 kubectl apply -f .kube/.
-minikube service nginx-service -n cakephp-docker
+```
+
+Get Kubernetes URL:
+
+```console
+minikube service nginx-service -n mixerapi-docker
 ```
 
 ## Using local image
@@ -19,9 +31,18 @@ You may find it helpful to work with a local image instead of continually deploy
 ```console
 eval (minikube docker-env)
 docker run -d -p 5005:5005 --restart=always --name registry registry:2
-docker build . -f .docker/Dockerfile -t localhost:5005/cakephp-docker:4.2-latest
+docker build . -f .docker/Dockerfile -t localhost:5005/mixerapidev-demo:latest
+docker push localhost:5005/mixerapidev-demo:latest
 ```
 
-In [php.yaml](php.yaml) change the image to `localhost:5005/cakephp-docker:4.2-latest`.
+In [php.yaml](php.yaml.bak) change the image to `localhost:5005/mixerapidev-demo:latest`.
 
 > Source: https://shashanksrivastava.medium.com/how-to-set-up-minikube-to-use-your-local-docker-registry-10a5b564883
+
+Docker build / push commands:
+
+```console
+docker build . -t mixerapidev/demo:latest
+docker push mixerapidev/demo:latest
+```
+

.kube/README.md

@@ -2,7 +2,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: mysql-secret
-  namespace: cakephp-docker
+  namespace: mixerapi-docker
 type: Opaque
 data:
   mysql-root-password: cm9vdA==

.kube/mysql-secret.yaml

@@ -2,7 +2,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mysql-deployment
-  namespace: cakephp-docker
+  namespace: mixerapi-docker
   labels:
     app: mysql
 spec:
@@ -47,7 +47,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: mysql-pv-claim
-  namespace: cakephp-docker
+  namespace: mixerapi-docker
   labels:
     app: mysql
 spec:
@@ -61,7 +61,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: mysql-service
-  namespace: cakephp-docker
+  namespace: mixerapi-docker
 spec:
   selector:
     app: mysql

.kube/mysql.yaml

@@ -1,4 +1,4 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: cakephp-docker
+  name: mixerapi-docker