fix(build): Set a default value for each build arg

Closes #1015
deviantony · Sep 14, 2024 · e8a5397 · e8a5397
1 parent fbf3041
commit e8a5397
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <name|url>
diff --git 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
@@ -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"]