From 8ae18d7897a64d5e646c6fc79339f2f2864993f4 Mon Sep 17 00:00:00 2001 From: Nicolas Ruflin Date: Tue, 20 Feb 2024 13:48:54 +0100 Subject: [PATCH] Fix error for tianon images on mac Adding multiarch to all tianon images to make it work on mac again. --- internal/stack/_static/docker-compose-stack.yml.tmpl | 12 ++++++------ .../stack/_static/serverless-docker-compose.yml.tmpl | 4 ++-- .../sql_input/_dev/deploy/docker/docker-compose.yml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/internal/stack/_static/docker-compose-stack.yml.tmpl b/internal/stack/_static/docker-compose-stack.yml.tmpl index 19af7e6adc..0e70c38f1c 100644 --- a/internal/stack/_static/docker-compose-stack.yml.tmpl +++ b/internal/stack/_static/docker-compose-stack.yml.tmpl @@ -21,7 +21,7 @@ services: - "127.0.0.1:9200:9200" elasticsearch_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: elasticsearch: condition: service_healthy @@ -50,7 +50,7 @@ services: - "127.0.0.1:5601:5601" kibana_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: kibana: condition: service_healthy @@ -82,7 +82,7 @@ services: - "127.0.0.1:9000:9000" package-registry_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: package-registry: condition: service_healthy @@ -122,7 +122,7 @@ services: {{ end }} fleet-server_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: fleet-server: condition: service_healthy @@ -151,7 +151,7 @@ services: target: /run/service_logs/ elastic-agent_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: elastic-agent: condition: service_healthy @@ -186,7 +186,7 @@ services: - ELASTIC_HOSTS=https://127.0.0.1:9200 logstash_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: logstash: condition: service_healthy diff --git a/internal/stack/_static/serverless-docker-compose.yml.tmpl b/internal/stack/_static/serverless-docker-compose.yml.tmpl index 4069869111..901efe6cd5 100644 --- a/internal/stack/_static/serverless-docker-compose.yml.tmpl +++ b/internal/stack/_static/serverless-docker-compose.yml.tmpl @@ -21,7 +21,7 @@ services: - "../certs/ca-cert.pem:/etc/ssl/certs/elastic-package.pem" elastic-agent_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: elastic-agent: condition: service_healthy @@ -50,7 +50,7 @@ services: - ELASTIC_HOSTS={{ fact "elasticsearch_host" }} logstash_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: logstash: condition: service_healthy diff --git a/test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml b/test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml index cea1c514d8..9979471a61 100755 --- a/test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml +++ b/test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml @@ -8,7 +8,7 @@ services: - ${SERVICE_LOGS_DIR}/sql_input:/var/log/mysql - mysqldata:/var/lib/mysql sql_input_is_ready: - image: tianon/true + image: tianon/true:multiarch depends_on: sql_input: condition: service_healthy