Skip to content

Commit f00e430

Browse files
add support for IS_READY_IMAGE_REF_OVERRIDE
1 parent e68b9cb commit f00e430

File tree

3 files changed

+12
-6
lines changed

3 files changed

+12
-6
lines changed

docs/howto/custom_images.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ The current images that could be overwritten are:
2121
| Kibana | KIBANA_IMAGE_REF_OVERRIDE | kibana |
2222
| Elastic Agent | ELASTIC_AGENT_IMAGE_REF_OVERRIDE | elastic-agent |
2323
| Logstash | LOGSTASH_IMAGE_REF_OVERRIDE | logstash |
24+
| is_ready | IS_READY_IMAGE_REF_OVERRIDE | is_ready |
2425

2526

2627
For the following two examples, it will be used as example overwriting elastic-agent image.

internal/install/application_configuration.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ const (
3737
elasticsearchImageName = "docker.elastic.co/elasticsearch/elasticsearch"
3838
kibanaImageName = "docker.elastic.co/kibana/kibana"
3939
logstashImageName = "docker.elastic.co/logstash/logstash"
40+
isreadyImageName = "tianon/true:multiarch"
4041

4142
applicationConfigurationYmlFile = "config.yml"
4243
)
@@ -101,6 +102,7 @@ func (s stack) ImageRefOverridesForVersion(version string) ImageRefs {
101102
Elasticsearch: checkImageRefOverride("ELASTICSEARCH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Elasticsearch, "")),
102103
Kibana: checkImageRefOverride("KIBANA_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Kibana, "")),
103104
Logstash: checkImageRefOverride("LOGSTASH_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.Logstash, "")),
105+
is_ready: checkImageRefOverride("IS_READY_IMAGE_REF_OVERRIDE", stringOrDefault(appConfigImageRefs.is_ready, "")),
104106
}
105107
}
106108

@@ -110,6 +112,7 @@ type ImageRefs struct {
110112
Elasticsearch string `yaml:"elasticsearch"`
111113
Kibana string `yaml:"kibana"`
112114
Logstash string `yaml:"logstash"`
115+
is_ready string `yaml:"is_ready"`
113116
}
114117

115118
// AsEnv method returns key=value representation of image refs.
@@ -119,6 +122,7 @@ func (ir ImageRefs) AsEnv() []string {
119122
vars = append(vars, "ELASTICSEARCH_IMAGE_REF="+ir.Elasticsearch)
120123
vars = append(vars, "KIBANA_IMAGE_REF="+ir.Kibana)
121124
vars = append(vars, "LOGSTASH_IMAGE_REF="+ir.Logstash)
125+
vars = append(vars, "IS_READY_IMAGE_REF="+ir.is_ready)
122126
return vars
123127
}
124128

@@ -129,6 +133,7 @@ func (ac *ApplicationConfiguration) StackImageRefs() ImageRefs {
129133
refs.Elasticsearch = stringOrDefault(refs.Elasticsearch, fmt.Sprintf("%s:%s", elasticsearchImageName, ac.stackVersion))
130134
refs.Kibana = stringOrDefault(refs.Kibana, fmt.Sprintf("%s:%s", kibanaImageName, ac.stackVersion))
131135
refs.Logstash = stringOrDefault(refs.Logstash, fmt.Sprintf("%s:%s", logstashImageName, ac.stackVersion))
136+
refs.is_ready = stringOrDefault(refs.is_ready, isreadyImageName)
132137
return refs
133138
}
134139

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ services:
2828
- "127.0.0.1:9200:9200"
2929

3030
elasticsearch_is_ready:
31-
image: tianon/true:multiarch
31+
image: "${IS_READY_IMAGE_REF}"
3232
depends_on:
3333
elasticsearch:
3434
condition: service_healthy
@@ -57,7 +57,7 @@ services:
5757
- "127.0.0.1:5601:5601"
5858

5959
kibana_is_ready:
60-
image: tianon/true:multiarch
60+
image: "${IS_READY_IMAGE_REF}"
6161
depends_on:
6262
kibana:
6363
condition: service_healthy
@@ -89,7 +89,7 @@ services:
8989
- "127.0.0.1:9000:9000"
9090

9191
package-registry_is_ready:
92-
image: tianon/true:multiarch
92+
image: "${IS_READY_IMAGE_REF}"
9393
depends_on:
9494
package-registry:
9595
condition: service_healthy
@@ -130,7 +130,7 @@ services:
130130
{{ end }}
131131

132132
fleet-server_is_ready:
133-
image: tianon/true:multiarch
133+
image: "${IS_READY_IMAGE_REF}"
134134
depends_on:
135135
fleet-server:
136136
condition: service_healthy
@@ -162,7 +162,7 @@ services:
162162
target: /run/service_logs/
163163

164164
elastic-agent_is_ready:
165-
image: tianon/true:multiarch
165+
image: "${IS_READY_IMAGE_REF}"
166166
depends_on:
167167
elastic-agent:
168168
condition: service_healthy
@@ -195,7 +195,7 @@ services:
195195
- ELASTIC_HOSTS=https://127.0.0.1:9200
196196

197197
logstash_is_ready:
198-
image: tianon/true:multiarch
198+
image: "${IS_READY_IMAGE_REF}"
199199
depends_on:
200200
logstash:
201201
condition: service_healthy

0 commit comments

Comments
 (0)