From e8a539777f6b134be21c8e9da51c95f3074b4cf2 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Sat, 14 Sep 2024 18:31:30 +0000 Subject: [PATCH] fix(build): Set a default value for each build arg Closes #1015 --- .github/workflows/update.yml | 2 +- elasticsearch/Dockerfile | 2 +- extensions/enterprise-search/Dockerfile | 2 +- extensions/filebeat/Dockerfile | 2 +- extensions/fleet/Dockerfile | 2 +- extensions/heartbeat/Dockerfile | 2 +- extensions/metricbeat/Dockerfile | 2 +- kibana/Dockerfile | 2 +- logstash/Dockerfile | 2 +- setup/Dockerfile | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index f0d4be745c..652287b160 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -70,7 +70,7 @@ jobs: # Escape period characters so sed interprets them literally cur_ver="${cur_ver//./\\.}" - declare -a upd_files=( .env README.md ) + declare -a upd_files=( .env README.md */Dockerfile extensions/*/Dockerfile ) if [ -f tls/README.md ]; then upd_files+=( tls/README.md ) fi diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 22528c6d7b..39e4ab3c36 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,7 +1,7 @@ ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} +FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.15.1} # Add your elasticsearch plugins setup here # Example: RUN elasticsearch-plugin install analysis-icu diff --git a/extensions/enterprise-search/Dockerfile b/extensions/enterprise-search/Dockerfile index 4f0752e55a..a68c519336 100644 --- a/extensions/enterprise-search/Dockerfile +++ b/extensions/enterprise-search/Dockerfile @@ -1,4 +1,4 @@ ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/enterprise-search/enterprise-search:${ELASTIC_VERSION} +FROM docker.elastic.co/enterprise-search/enterprise-search:${ELASTIC_VERSION:-8.15.1} diff --git a/extensions/filebeat/Dockerfile b/extensions/filebeat/Dockerfile index b8dd5f3f5a..d1001bdb2d 100644 --- a/extensions/filebeat/Dockerfile +++ b/extensions/filebeat/Dockerfile @@ -1,3 +1,3 @@ ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION} +FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION:-8.15.1} diff --git a/extensions/fleet/Dockerfile b/extensions/fleet/Dockerfile index 0b5a691dd0..acfe9da8dc 100644 --- a/extensions/fleet/Dockerfile +++ b/extensions/fleet/Dockerfile @@ -1,6 +1,6 @@ ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/elastic-agent:${ELASTIC_VERSION} +FROM docker.elastic.co/beats/elastic-agent:${ELASTIC_VERSION:-8.15.1} # Ensure the 'state' directory exists and is owned by the 'elastic-agent' user, # otherwise mounting a named volume in that location creates a directory owned diff --git a/extensions/heartbeat/Dockerfile b/extensions/heartbeat/Dockerfile index 0d7de1964a..7731d66d6b 100644 --- a/extensions/heartbeat/Dockerfile +++ b/extensions/heartbeat/Dockerfile @@ -1,3 +1,3 @@ ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/heartbeat:${ELASTIC_VERSION} +FROM docker.elastic.co/beats/heartbeat:${ELASTIC_VERSION:-8.15.1} diff --git a/extensions/metricbeat/Dockerfile b/extensions/metricbeat/Dockerfile index 6d05bf55f2..b9313e4994 100644 --- a/extensions/metricbeat/Dockerfile +++ b/extensions/metricbeat/Dockerfile @@ -1,3 +1,3 @@ ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION} +FROM docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION:-8.15.1} diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 9a075bedb9..7e4c501eba 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/kibana/kibana:${ELASTIC_VERSION} +FROM docker.elastic.co/kibana/kibana:${ELASTIC_VERSION:-8.15.1} # Add your kibana plugins setup here # Example: RUN kibana-plugin install diff --git a/logstash/Dockerfile b/logstash/Dockerfile index bde5808d98..348ca41dbe 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,7 +1,7 @@ ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION} +FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION:-8.15.1} # Add your logstash plugins setup here # Example: RUN logstash-plugin install logstash-filter-json diff --git a/setup/Dockerfile b/setup/Dockerfile index 1cb7538995..86254a138d 100644 --- a/setup/Dockerfile +++ b/setup/Dockerfile @@ -1,6 +1,6 @@ ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} +FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION:-8.15.1} ENTRYPOINT ["/entrypoint.sh"]