Skip to content

Commit b37077c

Browse files
authored
Add linux/amd64 platform for tianon/true service (#1694)
Updated all services using tianon/true image to define platform setting to be "linux/amd64", so "elastic-package stack up" command works in Mac too.
1 parent a94e00c commit b37077c

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

internal/stack/_static/docker-compose-stack.yml.tmpl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{ $username := fact "username" }}
22
{{ $password := fact "password" }}
33
{{ $apm_enabled := fact "apm_enabled" }}
4-
version: '2.3'
4+
version: '2.4'
55
services:
66
elasticsearch:
77
image: "${ELASTICSEARCH_IMAGE_REF}"
@@ -22,6 +22,7 @@ services:
2222

2323
elasticsearch_is_ready:
2424
image: tianon/true
25+
platform: linux/amd64
2526
depends_on:
2627
elasticsearch:
2728
condition: service_healthy
@@ -51,6 +52,7 @@ services:
5152

5253
kibana_is_ready:
5354
image: tianon/true
55+
platform: linux/amd64
5456
depends_on:
5557
kibana:
5658
condition: service_healthy
@@ -83,6 +85,7 @@ services:
8385

8486
package-registry_is_ready:
8587
image: tianon/true
88+
platform: linux/amd64
8689
depends_on:
8790
package-registry:
8891
condition: service_healthy
@@ -123,6 +126,7 @@ services:
123126

124127
fleet-server_is_ready:
125128
image: tianon/true
129+
platform: linux/amd64
126130
depends_on:
127131
fleet-server:
128132
condition: service_healthy
@@ -152,6 +156,7 @@ services:
152156

153157
elastic-agent_is_ready:
154158
image: tianon/true
159+
platform: linux/amd64
155160
depends_on:
156161
elastic-agent:
157162
condition: service_healthy
@@ -185,6 +190,7 @@ services:
185190

186191
logstash_is_ready:
187192
image: tianon/true
193+
platform: linux/amd64
188194
depends_on:
189195
logstash:
190196
condition: service_healthy

internal/stack/_static/serverless-docker-compose.yml.tmpl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.3'
1+
version: '2.4'
22
services:
33
elastic-agent:
44
image: "{{ fact "agent_image" }}"
@@ -22,6 +22,7 @@ services:
2222

2323
elastic-agent_is_ready:
2424
image: tianon/true
25+
platform: linux/amd64
2526
depends_on:
2627
elastic-agent:
2728
condition: service_healthy
@@ -52,6 +53,7 @@ services:
5253

5354
logstash_is_ready:
5455
image: tianon/true
56+
platform: linux/amd64
5557
depends_on:
5658
logstash:
5759
condition: service_healthy

test/packages/parallel/sql_input/_dev/deploy/docker/docker-compose.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: '2.3'
1+
version: '2.4'
22
services:
33
sql_input:
44
build: .
@@ -9,6 +9,7 @@ services:
99
- mysqldata:/var/lib/mysql
1010
sql_input_is_ready:
1111
image: tianon/true
12+
platform: linux/amd64
1213
depends_on:
1314
sql_input:
1415
condition: service_healthy

0 commit comments

Comments
 (0)