Merge pull request #16 from MayMeow/dev/update-dev-environment

Updated dev environment docker-compose files to use FPM+NGINX instead of built-in PHP server

Author: May

.env.dev .env.env.dev renamed to .env

@@ -1,23 +1,23 @@
 # Debug
 # -----
-DEBUG=true
+DEBUG=true # IMPORTANT: Disable this for production environment
 
 # App settings
 # -----------------------
 # Define your own salt or app will use generated one
 # SECURITY_SALT=
-DB_HOST=cake-db
-DB_PASSWORD=cakepass
+DB_HOST=db
+DB_PASSWORD=cakepass # Change password for production environment
 DB_NAME=cake
 DB_USER=cake
 
 # Redis
 # -----
-REDIS_HOST=cake-redis
+REDIS_HOST=redis
 REDIS_PORT=6379
 
 # Database
 # --------
-POSTGRES_PASSWORD=cakepass
+POSTGRES_PASSWORD=cakepass # Change password for production environment
 POSTGRES_USER=cake
 POSTGRES_DB=cake

.env.example

@@ -0,0 +1,23 @@
+# Debug
+# -----
+DEBUG=true # IMPORTANT: Disable this for production environment
+
+# App settings
+# -----------------------
+# Define your own salt or app will use generated one
+# SECURITY_SALT=
+DB_HOST=db
+DB_PASSWORD=cakepass # Change password for production environment
+DB_NAME=cake
+DB_USER=cake
+
+# Redis
+# -----
+REDIS_HOST=redis
+REDIS_PORT=6379
+
+# Database
+# --------
+POSTGRES_PASSWORD=cakepass # Change password for production environment
+POSTGRES_USER=cake
+POSTGRES_DB=cake

.env.production.sample

@@ -14,10 +14,10 @@ Services contained for dev environment in `docker-compose.dev.yml`
 
 |Service|Ports|Description|
 |----|----|----|
-|Cakephp App|8765|Your application|
-|Adminer|8080|Database management tool|
-|Postgres|5432 not exposed|Database server|
-|Redis|6379 not exposed|Cache server|
+|Your App|8080|Your application|
+|Adminer|8081|Database management tool|
+|Postgres|5432 not exposed in production environment|Database server|
+|Redis|6379 not exposed in production environment|Cache server|
 |Minio| 9000 (Api), 9001 (Console)|S3 compatible storage server|
 
 ## Installation

README.md

@@ -1,59 +1,67 @@
 version: "3.7"
 
 services:
-  cake-app:
+  nginx:
     build:
-      args:
-        user: cake
-        uid: 1000
-      context: ./
-      dockerfile: ./vendor/maymeow/sail/sdk/8.0/Dockerfile
-    # image: ghcr.io/maymeow/cake-notify/cake-notify:latest
-    command: bash -c "composer install && php bin/cake.php server -H 0.0.0.0"
-    env_file: .env.dev
-    working_dir: /var/www/
-    networks:
-      - cake
+      context: ./docker/nginx
+      dockerfile: Dockerfile
+    volumes_from:
+      - app
     ports:
-      - "8765:8765"
+      - "8080:80"
+    restart: unless-stopped
+    depends_on:
+      - app
+      - db
+      - redis
+
+  composer:
+    image: ghcr.io/maymeow/php/sdk:8.1.6
+    user: "1000:1000"
+    working_dir: /var/www/
+    command:  bash -c "composer install"
+    depends_on:
+      - db
+      - redis
+    volumes:
+      - ./:/var/www
+
+  app:
+    image: ghcr.io/maymeow/php/runtime:8.1.6
+    user: "1000:1000"
+    env_file: .env
+    restart: unless-stopped
+    working_dir: /var/www/
     depends_on:
-      - cake-db
-      - cake-redis
+      - db
+      - redis
     volumes:
       - ./:/var/www
 
-  cake-db:
+  db:
     image: postgres:12.4
-    networks:
-      - cake
-    # ports:
-    #   - "5432:5432"
+    ports:
+      - "5432:5432"
     volumes:
       - cake_data:/var/lib/postgresql/data
-    env_file: .env.dev
+    env_file: .env
 
-  cake-redis:
+  redis:
     image: "redis:alpine"
-    networks:
-      - cake
     volumes:
       - cake_redis:/data
 
   # if you need graphic acces to application database
   adminer:
     image: adminer
-    networks:
-      - cake
     ports:
-      - "8080:8080"
+      - "8081:8080"
 
   minio:
     image: minio/minio:RELEASE.2021-08-05T22-01-19Z
-    networks:
-      - cake
     volumes:
       - minio_data:/data
-    env_file: .env.dev
+    env_file: .env
     command: server /data --console-address :9001
     ports:
       - "9000:9000"

docker-compose.dev.yml

@@ -15,7 +15,7 @@ services:
       context: ./
       dockerfile: ./docker/app/Dockerfile
     # image: ghcr.io/maymeow/cake-notify/cake-notify:latest
-    env_file: .env.production
+    env_file: .env
     container_name: app
     restart: unless-stopped
     working_dir: /var/www/
@@ -27,6 +27,8 @@ services:
       - redis
     volumes:
       - /var/www
+      # For sqlite uncomment following line
+      # - ./app.sq3:/app.sq3
 
   db:
     image: postgres:12.4
@@ -36,7 +38,7 @@ services:
     restart: unless-stopped
     volumes:
       - ./data/db:/var/lib/postgresql/data
-    env_file: .env.production
+    env_file: .env
 
   nginx:
     build:
@@ -77,3 +79,17 @@ services:
   #   networks:
   #     - frontend
   #   restart: unless-stopped
+
+  # If you need/want use minio S3 storage uncomment following
+  # minio:
+  #   image: minio/minio:RELEASE.2021-08-05T22-01-19Z
+  #   volumes:
+  #     - minio_data:/data
+  #   env_file: .env
+  # networks:
+  #     - cake_backend
+  #   command: server /data --console-address :9001
+  # Optional: uncomment if you want to expose ports
+  #   ports:
+  #     - "9000:9000"
+  #     - "9001:9001"

docker-compose.prod.yml

@@ -1,4 +1,4 @@
-FROM ghcr.io/maymeow/php-ci-cd/php-ci-cd:8.1.6-cs-git-psalm AS build-env
+FROM ghcr.io/maymeow/php/sdk:8.1.6 AS build-env
 
 WORKDIR /app
 
@@ -7,7 +7,7 @@ COPY . /app
 ## uncomment --no-scripts if you want to remove composer postinstallation scripts
 RUN composer install --no-ansi --no-dev --no-interaction --no-plugins --no-progress --optimize-autoloader #--no-scripts
 
-FROM ghcr.io/maymeow/webapp-base/webapp-base:8.1.6
+FROM ghcr.io/maymeow/php/runtime:8.1.6
 
 ARG user=www-data
 

docker/app/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/maymeow/php-ci-cd/php-ci-cd:8.1.6-cs-git-psalm
+FROM ghcr.io/maymeow/php/sdk:8.1.6
 
 # arguments in docker-compose file
 ARG user=vscode

docker/devcontainer/Dockerfile

@@ -17,7 +17,7 @@ server {
     location ~ \.php$ {
         try_files $uri =404;
         fastcgi_split_path_info ^(.+\.php)(/.+)$;
-        fastcgi_pass cakenotify_app:9000;
+        fastcgi_pass app:9000;
         fastcgi_index index.php;
         include fastcgi_params;
         fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;