From 2c3195c0afbbaf5e87be73cc8881b32286d44e48 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Mon, 10 Aug 2020 16:30:10 -0400 Subject: [PATCH 1/5] Use init Signed-off-by: Andrew Welch --- docker-compose/craft-mariadb/docker-compose.yml | 5 +++++ docker-compose/craft-postgres/docker-compose.yml | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/docker-compose/craft-mariadb/docker-compose.yml b/docker-compose/craft-mariadb/docker-compose.yml index d27089d..c08f6c4 100755 --- 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: @@ -27,6 +28,7 @@ services: *env expose: - "9000" + init: true links: - mariadb - redis @@ -48,6 +50,7 @@ services: MYSQL_DATABASE: project MYSQL_USER: project MYSQL_PASSWORD: project + init: true ports: - "3306:3306" volumes: @@ -59,6 +62,7 @@ services: dockerfile: ./Dockerfile expose: - "6379" + init: true # webpack - frontend build system webpack: build: @@ -66,6 +70,7 @@ services: 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 index f9a2cdc..e3f9b5d 100755 --- a/docker-compose/craft-postgres/docker-compose.yml +++ b/docker-compose/craft-postgres/docker-compose.yml @@ -10,6 +10,7 @@ services: - ./cms/.env links: - php + init: true ports: - "8000:80" volumes: @@ -27,6 +28,7 @@ services: *env expose: - "9000" + init: true links: - postgres - redis @@ -47,6 +49,7 @@ services: POSTGRES_DB: project POSTGRES_USER: project POSTGRES_PASSWORD: project + init: true ports: - "5432:5432" volumes: @@ -58,6 +61,7 @@ services: dockerfile: ./Dockerfile expose: - "6379" + init: true # webpack - frontend build system webpack: build: @@ -65,6 +69,7 @@ services: dockerfile: ./Dockerfile env_file: *env + init: true ports: - "8080:8080" volumes: From 6a808fee339a474d219b8931845386b5af1dd224 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 5 Sep 2020 22:09:49 -0400 Subject: [PATCH 2/5] Added image optimizers to the `php-dev-craft` Docker image Signed-off-by: Andrew Welch --- php-dev-craft/mariadb/Dockerfile | 4 ++++ php-dev-craft/postgres/Dockerfile | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/php-dev-craft/mariadb/Dockerfile b/php-dev-craft/mariadb/Dockerfile index 8258105..18049f6 100755 --- 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 index 5031240..db87aad 100755 --- 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 \ From d0ecda86d1945a84baf680e8908bd96b206ddeed Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Sat, 5 Sep 2020 22:10:05 -0400 Subject: [PATCH 3/5] Version 1.0.1 Signed-off-by: Andrew Welch --- CHANGELOG.md | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 CHANGELOG.md diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000..cf9fa68 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# nystudio107/docker-images Change Log + +## 1.0.1 - 2020.09.10 +### Added +* Added image optimizers to the `php-dev-craft` Docker image + +## 1.0.0 - 2020.06.01 +### Added +* Initial release From c9ebb47e7eae59d71f0f7d8dfd700a2d7c0b36c7 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Wed, 9 Sep 2020 09:48:29 -0400 Subject: [PATCH 4/5] Added a `queue` docker container to run queue jobs via `./craft queue/listen` --- .../craft-mariadb/docker-compose.yml | 22 ++++++++++++++++--- .../craft-postgres/docker-compose.yml | 22 ++++++++++++++++--- 2 files changed, 38 insertions(+), 6 deletions(-) diff --git a/docker-compose/craft-mariadb/docker-compose.yml b/docker-compose/craft-mariadb/docker-compose.yml index c08f6c4..9230682 100755 --- a/docker-compose/craft-mariadb/docker-compose.yml +++ b/docker-compose/craft-mariadb/docker-compose.yml @@ -18,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: @@ -29,15 +29,31 @@ services: expose: - "9000" init: true - links: + 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: diff --git a/docker-compose/craft-postgres/docker-compose.yml b/docker-compose/craft-postgres/docker-compose.yml index e3f9b5d..a06fe7c 100755 --- a/docker-compose/craft-postgres/docker-compose.yml +++ b/docker-compose/craft-postgres/docker-compose.yml @@ -18,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: @@ -29,15 +29,31 @@ services: expose: - "9000" init: true - links: + 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: From cb455f2931912e054e923e3cf02f1638cee0fc55 Mon Sep 17 00:00:00 2001 From: Andrew Welch Date: Wed, 9 Sep 2020 09:48:49 -0400 Subject: [PATCH 5/5] Version 1.0.2 --- CHANGELOG.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf9fa68..072d83e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,10 @@ # nystudio107/docker-images Change Log -## 1.0.1 - 2020.09.10 +## 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