Merge upstream (#2)

* Refactors project (read below)

- Moves Dockerfile, docker-compose.yaml, & .dockerignore to project root
- Fixes bugs in docker-entrypoint
- Makes k8s work in minikube in prod mode

* Fix image job

* disable running image

* Improves docker entry point, disables image action

Author: cnizzardini

.docker/.dockerignore

@@ -1,7 +1,6 @@
 # 🐋 Docker
 
-It's expected that you will use your own Dockerfile for production. All docker-related configurations are stored
-in this directory. See [docker-compose.yml](docker-compose.yml) and [Dockerfile](Dockerfile).
+It's expected that you will use your own Dockerfile for production.
 
 ## NGINX
 

.docker/README.md

@@ -32,21 +32,18 @@ if [ "$1" = 'php-fpm' ] || [ "$1" = 'php' ] || [ "$1" = 'bin/cakephp' ]; then
         composer require mixerapi/mixerapi
         bin/cake plugin load MixerApi
         bin/cake mixerapi install --auto Y
-
-        if [ "$APP_ENV" = 'dev' ]; then
-            chown -R cakephp:www-data .
-        fi
-
-        setfacl -R -m u:www-data:rwX -m u:"$(whoami)":rwX logs
-        setfacl -dR -m u:www-data:rwX -m u:"$(whoami)":rwX tmp
     fi
 
-    if [ "$APP_ENV" = 'prod' ]; then
-        composer install --prefer-dist --no-interaction --no-dev
-    else
+    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
+    chown -R cakephp:www-data .
+    chmod 774 -R .
 fi
 
 exec docker-php-entrypoint "$@"

.docker/php/docker-entrypoint.sh

@@ -0,0 +1,11 @@
+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

.dockerignore

@@ -14,12 +14,12 @@ jobs:
           cp .docker/php.env.development .docker/php.env
           cp .docker/mysql.env.development .docker/mysql.env
       - name: Pull images
-        run: docker-compose -f .docker/docker-compose.yml pull
+        run: docker-compose pull
       - name: Build
-        run: docker-compose -f .docker/docker-compose.yml 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 -f .docker/docker-compose.yml up -d
+        run: docker-compose up -d
       - name: Wait for services
         run: sleep 5
       - name: HTTP Check
-        run: curl -v -o /dev/null http://localhost:8080
+        run: curl -v -o /dev/null http://localhost:8080

.github/workflows/build.yml

@@ -0,0 +1,47 @@
+name: Image
+
+on:
+  create:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+
+      - name: Prepare
+        id: prep
+        run: |
+          DOCKER_IMAGE=cnizzardini/cakephp-docker
+          VERSION=edge
+          if [[ $GITHUB_REF == refs/tags/* ]]; then
+            VERSION=${GITHUB_REF#refs/tags/v}
+          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.2-latest"
+          fi
+          echo ::set-output name=tags::${TAGS}
+      -
+        name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          context: ./
+          push: ${{ github.event_name != 'pull_request' }}
+          tags: ${{ steps.prep.outputs.tags }}
+          build-args: ENV=prod
+      -
+        name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}

.github/workflows/image.yml.template

@@ -3,25 +3,52 @@
 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 .
-minikube service nginx-service -n cakephp-docker
+kubectl apply -f .kube/.
+```
+
+Minikube dashboard:
+
+```console
+minikube dashboard --url
+```
+
+Create services:
+
+```console
+minikube service nginx -n cakephp-docker
+minikube service mysql -n cakephp-docker
 ```
 
-## Using local image
+Browse to the given nginx url:
+
+```console
+minikube service list
+```
 
-You may find it helpful to work with a local image instead of continually deploying to a container registry.
+MySQL:
 
 ```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
+mysql -u cakephp -h 192.168.49.2 -p --port 32089
 ```
 
-In [php.yaml](php.yaml) change the image to `localhost:5005/cakephp-docker:4.2-latest`.
+> Password is `cakephp`
+
+Docker build / push commands:
+
+```console
+docker build . -t cnizzardini/cakephp-docker:latest
+docker push cnizzardini/cakephp-docker:latest
+```
 
-> Source: https://shashanksrivastava.medium.com/how-to-set-up-minikube-to-use-your-local-docker-registry-10a5b564883

.kube/README.md

@@ -5,6 +5,8 @@ metadata:
   namespace: cakephp-docker
 type: Opaque
 data:
+  # root
   mysql-root-password: cm9vdA==
+  # cakephp
   mysql-user: Y2FrZXBocA==
   mysql-password: Y2FrZXBocA==

.kube/mysql-secret.yaml

@@ -1,3 +1,17 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: mysql-config
+  namespace: cakephp-docker
+  labels:
+    app: mysql
+data:
+  default_auth: |
+    [mysqld]
+    default_authentication_plugin= mysql_native_password
+    sql-mode=""
+
+---
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -38,7 +52,14 @@ spec:
                 secretKeyRef:
                   name: mysql-secret
                   key: mysql-password
+          volumeMounts:
+            - name: mysql-config-volume
+              mountPath: /etc/mysql/conf.d/default_auth.cnf
+              subPath: default_auth
       volumes:
+        - name: mysql-config-volume
+          configMap:
+            name: mysql-config
         - name: mysql
           persistentVolumeClaim:
             claimName: mysql-pv-claim
@@ -60,12 +81,14 @@ spec:
 apiVersion: v1
 kind: Service
 metadata:
-  name: mysql-service
+  name: mysql
   namespace: cakephp-docker
 spec:
+  type: NodePort
   selector:
     app: mysql
   ports:
     - protocol: TCP
       port: 3306
       targetPort: 3306
+      nodePort: 32089