From 02a59529a3a065a2328b8392628cbf6bedc29fbf Mon Sep 17 00:00:00 2001 From: Stephen Edgar Date: Mon, 20 Sep 2021 00:59:52 +1000 Subject: [PATCH 1/4] ARM64 Support - Stephen --- docker/minio.json | 2 +- .../class-docker-compose-generator.php | 20 +++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docker/minio.json b/docker/minio.json index ebc76325..42ec2fa3 100644 --- a/docker/minio.json +++ b/docker/minio.json @@ -1,5 +1,5 @@ { - "version": "9", + "version": "10", "hosts": { "local": { "url": "http://s3:9000", diff --git a/inc/composer/class-docker-compose-generator.php b/inc/composer/class-docker-compose-generator.php index be6314c6..3ebec688 100644 --- a/inc/composer/class-docker-compose-generator.php +++ b/inc/composer/class-docker-compose-generator.php @@ -91,7 +91,7 @@ protected function get_php_reusable() : array { 'condition' => 'service_started', ], ], - 'image' => 'humanmade/altis-local-server-php:4.0.0-dev', + 'image' => 'humanmade/altis-local-server-php:edge', 'links' => [ 'db:db-read-replica', 's3:s3.localhost', @@ -200,7 +200,7 @@ protected function get_service_cavalcade() : array { protected function get_service_nginx() : array { return [ 'nginx' => [ - 'image' => 'humanmade/altis-local-server-nginx:3.3.0', + 'image' => 'humanmade/altis-local-server-nginx:edge', 'networks' => [ 'proxy', 'default', @@ -256,7 +256,7 @@ protected function get_service_redis() : array { protected function get_service_db() : array { return [ 'db' => [ - 'image' => 'mysql:5.7', + 'image' => 'mysql/mysql-server:8.0', 'volumes' => [ 'db-data:/var/lib/mysql', ], @@ -416,7 +416,7 @@ protected function get_service_kibana() : array { protected function get_service_s3() : array { return [ 's3' => [ - 'image' => 'minio/minio:RELEASE.2020-03-19T21-49-00Z', + 'image' => 'minio/minio:latest', 'volumes' => [ 's3:/data:rw', ], @@ -455,7 +455,7 @@ protected function get_service_s3() : array { ], ], 's3-sync-to-host' => [ - 'image' => 'minio/mc:RELEASE.2020-03-14T01-23-37Z', + 'image' => 'minio/mc:latest', 'restart' => 'unless-stopped', 'depends_on' => [ 's3', @@ -480,7 +480,7 @@ protected function get_service_s3() : array { protected function get_service_tachyon() : array { return [ 'tachyon' => [ - 'image' => 'humanmade/tachyon:2.3.2', + 'image' => 'humanmade/tachyon:edge', 'ports' => [ '8080', ], @@ -513,7 +513,7 @@ protected function get_service_tachyon() : array { protected function get_service_mailhog() : array { return [ 'mailhog' => [ - 'image' => 'mailhog/mailhog:latest', + 'image' => 'cd2team/mailhog:latest', 'ports' => [ '8025', '1025', @@ -551,7 +551,7 @@ protected function get_service_analytics() : array { 'default', ], 'restart' => 'unless-stopped', - 'image' => 'humanmade/local-cognito:1.0.0', + 'image' => 'humanmade/local-cognito:edge', 'labels' => [ 'traefik.port=3000', 'traefik.protocol=http', @@ -568,7 +568,7 @@ protected function get_service_analytics() : array { 'default', ], 'restart' => 'unless-stopped', - 'image' => 'humanmade/local-pinpoint:1.2.3', + 'image' => 'humanmade/local-pinpoint:edge', 'labels' => [ 'traefik.port=3000', 'traefik.protocol=http', @@ -590,7 +590,7 @@ protected function get_service_analytics() : array { protected function get_service_xray() : array { return [ 'xray' => [ - 'image' => 'amazon/aws-xray-daemon:3.0.1', + 'image' => 'amazon/aws-xray-daemon:latest', 'ports' => [ '2000', ], From d0a266eb1670237136aacb0a060b18e3d897b770 Mon Sep 17 00:00:00 2001 From: Robert O'Rourke Date: Tue, 28 Sep 2021 11:28:35 +0100 Subject: [PATCH 2/4] Use newer minio container for minio client command --- inc/composer/class-command.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/composer/class-command.php b/inc/composer/class-command.php index 8f197659..07a5ecaa 100644 --- a/inc/composer/class-command.php +++ b/inc/composer/class-command.php @@ -703,7 +703,7 @@ protected function minio_client( string $command ) { '--volume=%3$s/vendor/altis/local-server/docker/minio.json:/root/.mc/config.json ' . '--volume=%3$s/content/uploads:/content/uploads:delegated ' . '--network=%4$s_default ' . - 'minio/mc:RELEASE.2020-03-14T01-23-37Z %5$s', + 'minio/mc:RELEASE.2021-09-02T09-21-27Z %5$s', $columns, $lines, getcwd(), From de974c30edf24e8dc2b73e973169331a216d0315 Mon Sep 17 00:00:00 2001 From: Robert O'Rourke Date: Tue, 28 Sep 2021 14:41:45 +0100 Subject: [PATCH 3/4] Use pinned container versions --- .../class-docker-compose-generator.php | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/inc/composer/class-docker-compose-generator.php b/inc/composer/class-docker-compose-generator.php index 3ebec688..b62289e6 100644 --- a/inc/composer/class-docker-compose-generator.php +++ b/inc/composer/class-docker-compose-generator.php @@ -91,7 +91,7 @@ protected function get_php_reusable() : array { 'condition' => 'service_started', ], ], - 'image' => 'humanmade/altis-local-server-php:edge', + 'image' => 'humanmade/altis-local-server-php:4.2.0-dev', 'links' => [ 'db:db-read-replica', 's3:s3.localhost', @@ -200,7 +200,7 @@ protected function get_service_cavalcade() : array { protected function get_service_nginx() : array { return [ 'nginx' => [ - 'image' => 'humanmade/altis-local-server-nginx:edge', + 'image' => 'humanmade/altis-local-server-nginx:3.4.0', 'networks' => [ 'proxy', 'default', @@ -256,7 +256,7 @@ protected function get_service_redis() : array { protected function get_service_db() : array { return [ 'db' => [ - 'image' => 'mysql/mysql-server:8.0', + 'image' => 'biarms/mysql:5.7', 'volumes' => [ 'db-data:/var/lib/mysql', ], @@ -416,7 +416,7 @@ protected function get_service_kibana() : array { protected function get_service_s3() : array { return [ 's3' => [ - 'image' => 'minio/minio:latest', + 'image' => 'minio/minio:RELEASE.2021-09-18T18-09-59Z', 'volumes' => [ 's3:/data:rw', ], @@ -455,7 +455,7 @@ protected function get_service_s3() : array { ], ], 's3-sync-to-host' => [ - 'image' => 'minio/mc:latest', + 'image' => 'minio/mc:RELEASE.2021-09-02T09-21-27Z', 'restart' => 'unless-stopped', 'depends_on' => [ 's3', @@ -480,7 +480,7 @@ protected function get_service_s3() : array { protected function get_service_tachyon() : array { return [ 'tachyon' => [ - 'image' => 'humanmade/tachyon:edge', + 'image' => 'humanmade/tachyon:2.4.0', 'ports' => [ '8080', ], @@ -513,7 +513,7 @@ protected function get_service_tachyon() : array { protected function get_service_mailhog() : array { return [ 'mailhog' => [ - 'image' => 'cd2team/mailhog:latest', + 'image' => 'cd2team/mailhog:1632011321', 'ports' => [ '8025', '1025', @@ -551,7 +551,7 @@ protected function get_service_analytics() : array { 'default', ], 'restart' => 'unless-stopped', - 'image' => 'humanmade/local-cognito:edge', + 'image' => 'humanmade/local-cognito:1.1.0', 'labels' => [ 'traefik.port=3000', 'traefik.protocol=http', @@ -568,7 +568,7 @@ protected function get_service_analytics() : array { 'default', ], 'restart' => 'unless-stopped', - 'image' => 'humanmade/local-pinpoint:edge', + 'image' => 'humanmade/local-pinpoint:1.3.0', 'labels' => [ 'traefik.port=3000', 'traefik.protocol=http', @@ -590,7 +590,7 @@ protected function get_service_analytics() : array { protected function get_service_xray() : array { return [ 'xray' => [ - 'image' => 'amazon/aws-xray-daemon:latest', + 'image' => 'amazon/aws-xray-daemon:3.3.3', 'ports' => [ '2000', ], From 19c15fc391bdcfe54e84535417581f6b6486bad1 Mon Sep 17 00:00:00 2001 From: Robert O'Rourke Date: Wed, 29 Sep 2021 09:05:04 +0100 Subject: [PATCH 4/4] Fix tachyon and PHP tags --- inc/composer/class-docker-compose-generator.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/composer/class-docker-compose-generator.php b/inc/composer/class-docker-compose-generator.php index b62289e6..67f7086c 100644 --- a/inc/composer/class-docker-compose-generator.php +++ b/inc/composer/class-docker-compose-generator.php @@ -91,7 +91,7 @@ protected function get_php_reusable() : array { 'condition' => 'service_started', ], ], - 'image' => 'humanmade/altis-local-server-php:4.2.0-dev', + 'image' => 'humanmade/altis-local-server-php:4.2.0', 'links' => [ 'db:db-read-replica', 's3:s3.localhost', @@ -480,7 +480,7 @@ protected function get_service_s3() : array { protected function get_service_tachyon() : array { return [ 'tachyon' => [ - 'image' => 'humanmade/tachyon:2.4.0', + 'image' => 'humanmade/tachyon:v2.4.0', 'ports' => [ '8080', ],