From 697356b2b968592a2f72e1dc5aefe1839eafd61b Mon Sep 17 00:00:00 2001
From: michel-laterman <michel.laterman@elastic.co>
Date: Tue, 17 Sep 2024 09:33:13 -0700
Subject: [PATCH] Remove -amd64 tags

---
 dev-tools/e2e/docker-compose.yml         | 4 ++--
 dev-tools/integration/docker-compose.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dev-tools/e2e/docker-compose.yml b/dev-tools/e2e/docker-compose.yml
index 11c43eb5d..c260d2eee 100644
--- a/dev-tools/e2e/docker-compose.yml
+++ b/dev-tools/e2e/docker-compose.yml
@@ -1,6 +1,6 @@
 services:
   kibana:
-    image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/kibana/kibana:${ELASTICSEARCH_VERSION}"
     container_name: kibana
     healthcheck:
       test: ["CMD", "curl", "-f", "${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD}@localhost:5601/api/status"]
@@ -17,7 +17,7 @@ services:
     networks:
       - integration
   apm-server:
-    image:  "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}-amd64"
+    image:  "docker.elastic.co/apm/apm-server:${ELASTICSEARCH_VERSION}"
     container_name: apm-server
     # curl is not in the apm-server image
     #healthcheck:
diff --git a/dev-tools/integration/docker-compose.yml b/dev-tools/integration/docker-compose.yml
index c5eead706..132526923 100644
--- a/dev-tools/integration/docker-compose.yml
+++ b/dev-tools/integration/docker-compose.yml
@@ -3,7 +3,7 @@ volumes:
     driver: local
 services:
   setup:
-    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64
+    image: docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}
     volumes:
       - certs:/usr/share/elasticsearch/config/certs
     user: "0"
@@ -45,7 +45,7 @@ services:
         find . -type f -exec chmod 640 \{\} \;;
       ';
   elasticsearch:
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}"
     container_name: elasticsearch
     environment:
       - node.name=es01
@@ -89,7 +89,7 @@ services:
     depends_on:
       setup:
         condition: service_healthy
-    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}-amd64"
+    image: "docker.elastic.co/elasticsearch/elasticsearch:${ELASTICSEARCH_VERSION}"
     container_name: elasticsearch-remote
     environment:
       - node.name=es02