Merge branch 'release/1.0.2'

nystudio107 · Sep 9, 2020 · b74f344 · b74f344
2 parents 7aa54ab + cb455f2
commit b74f344
Show file tree

Hide file tree

Showing 5 changed files with 70 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,13 @@
+# nystudio107/docker-images Change Log
+
+## 1.0.2 - 2020.09.09
+### Added
+* Added a `queue` docker container to run queue jobs via `./craft queue/listen`
+
+## 1.0.1 - 2020.09.08
+### Added
+* Added image optimizers to the `php-dev-craft` Docker image
+
+## 1.0.0 - 2020.06.01
+### Added
+* Initial release
diff --git a/docker-compose/craft-mariadb/docker-compose.yml b/docker-compose/craft-mariadb/docker-compose.yml
@@ -8,6 +8,7 @@ services:
       dockerfile: ./Dockerfile
     env_file: &env
       - ./cms/.env
+    init: true
     links:
       - php
     ports:
@@ -17,7 +18,7 @@ services:
       - ./cms/web:/var/www/project/cms/web:cached
   # php - personal home page
   php:
-    build:
+    build: &php-build
       context: ./docker-config/php-dev-craft
       dockerfile: ./Dockerfile
     depends_on:
@@ -27,15 +28,32 @@ services:
       *env
     expose:
       - "9000"
-    links:
+    init: true
+    links: &php-links
       - mariadb
       - redis
-    volumes:
+    volumes: &php-volumes
       - cpresources:/var/www/project/cms/web/cpresources
       - storage:/var/www/project/cms/storage
       - ./cms:/var/www/project/cms:cached
       - ./cms/vendor:/var/www/project/cms/vendor:delegated
       - ./cms/storage/logs:/var/www/project/cms/storage/logs:delegated
+  # queue - runs queue jobs via ./craft queue/listen
+  queue:
+    build:
+      *php-build
+    command: ./craft queue/listen 10
+    depends_on:
+      - "php"
+    env_file:
+      *env
+    expose:
+      - "9001"
+    init: true
+    links:
+      *php-links
+    volumes:
+      *php-volumes
   # mariadb - database
   mariadb:
     build:
@@ -48,6 +66,7 @@ services:
       MYSQL_DATABASE: project
       MYSQL_USER: project
       MYSQL_PASSWORD: project
+    init: true
     ports:
       - "3306:3306"
     volumes:
@@ -59,13 +78,15 @@ services:
       dockerfile: ./Dockerfile
     expose:
       - "6379"
+    init: true
   # webpack - frontend build system
   webpack:
     build:
       context: ./docker-config/node-dev-webpack
       dockerfile: ./Dockerfile
     env_file:
       *env
+    init: true
     ports:
       - "8080:8080"
     volumes:

diff --git a/docker-compose/craft-postgres/docker-compose.yml b/docker-compose/craft-postgres/docker-compose.yml
@@ -10,14 +10,15 @@ services:
       - ./cms/.env
     links:
       - php
+    init: true
     ports:
       - "8000:80"
     volumes:
       - cpresources:/var/www/project/cms/web/cpresources
       - ./cms/web:/var/www/project/cms/web:cached
   # php - personal home page
   php:
-    build:
+    build: &php-build
       context: ./docker-config/php-dev-craft
       dockerfile: ./Dockerfile
     depends_on:
@@ -27,15 +28,32 @@ services:
       *env
     expose:
       - "9000"
-    links:
+    init: true
+    links: &php-links
       - postgres
       - redis
-    volumes:
+    volumes: &php-volumes
       - cpresources:/var/www/project/cms/web/cpresources
       - storage:/var/www/project/cms/storage
       - ./cms:/var/www/project/cms:cached
       - ./cms/vendor:/var/www/project/cms/vendor:delegated
       - ./cms/storage/logs:/var/www/project/cms/storage/logs:delegated
+  # queue - runs queue jobs via ./craft queue/listen
+  queue:
+    build:
+      *php-build
+    command: ./craft queue/listen 10
+    depends_on:
+      - "php"
+    env_file:
+      *env
+    expose:
+      - "9001"
+    init: true
+    links:
+      *php-links
+    volumes:
+      *php-volumes
   # postgres - database
   postgres:
     build:
@@ -47,6 +65,7 @@ services:
       POSTGRES_DB: project
       POSTGRES_USER: project
       POSTGRES_PASSWORD: project
+    init: true
     ports:
       - "5432:5432"
     volumes:
@@ -58,13 +77,15 @@ services:
       dockerfile: ./Dockerfile
     expose:
       - "6379"
+    init: true
   # webpack - frontend build system
   webpack:
     build:
       context: ./docker-config/node-dev-webpack
       dockerfile: ./Dockerfile
     env_file:
       *env
+    init: true
     ports:
       - "8080:8080"
     volumes:

diff --git a/php-dev-craft/mariadb/Dockerfile b/php-dev-craft/mariadb/Dockerfile
@@ -6,6 +6,10 @@ RUN apt-get update \
     # apt Debian packages
     apt-get install -y \
         nano \
+        jpegoptim \
+        optipng \
+        gifsicle \
+        webp \
     && \
     # Install PHP extensions
     docker-php-ext-install \

diff --git a/php-dev-craft/postgres/Dockerfile b/php-dev-craft/postgres/Dockerfile
@@ -5,7 +5,11 @@ RUN apt-get update \
     && \
     # apt Debian packages
     apt-get install -y \
-        ffmpeg \
+        nano \
+        jpegoptim \
+        optipng \
+        gifsicle \
+        webp \
     && \
     # Install PHP extensions
     docker-php-ext-install \