From eb1c6fa27e730a40b171d541d5c991ab243522c7 Mon Sep 17 00:00:00 2001 From: Antoine Cotten Date: Mon, 28 Feb 2022 09:10:30 +0100 Subject: [PATCH] chore: Rename ELK_VERSION to ELASTIC_VERSION More appropriate name considering that extensions, which aren't part of the "ELK" stack, also rely on this variable. --- .env | 2 +- .github/workflows/update.yml | 2 +- docker-compose.yml | 8 ++++---- elasticsearch/Dockerfile | 4 ++-- extensions/apm-server/Dockerfile | 4 ++-- extensions/apm-server/apm-server-compose.yml | 2 +- extensions/enterprise-search/Dockerfile | 4 ++-- .../enterprise-search/enterprise-search-compose.yml | 2 +- extensions/filebeat/Dockerfile | 4 ++-- extensions/filebeat/filebeat-compose.yml | 2 +- extensions/metricbeat/Dockerfile | 4 ++-- extensions/metricbeat/metricbeat-compose.yml | 2 +- kibana/Dockerfile | 4 ++-- logstash/Dockerfile | 4 ++-- setup/Dockerfile | 4 ++-- 15 files changed, 26 insertions(+), 26 deletions(-) diff --git a/.env b/.env index b419780..41d43a9 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -ELK_VERSION=8.0.0 +ELASTIC_VERSION=8.0.0 ## Passwords for stack users # diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index e0a0f03..d9d8cfa 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -65,7 +65,7 @@ jobs: if: steps.get-latest-release.outputs.result run: | source .env - cur_ver="$ELK_VERSION" + cur_ver="$ELASTIC_VERSION" new_ver=${{ fromJson(steps.get-latest-release.outputs.result).version }} # Escape dot characters so sed interprets them as literal dots diff --git a/docker-compose.yml b/docker-compose.yml index 8202cc8..b9e02c6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -13,7 +13,7 @@ services: build: context: setup/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - setup:/state:Z environment: @@ -27,7 +27,7 @@ services: build: context: elasticsearch/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,z - elasticsearch:/usr/share/elasticsearch/data:z @@ -50,7 +50,7 @@ services: build: context: logstash/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z - ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z @@ -71,7 +71,7 @@ services: build: context: kibana/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z ports: diff --git a/elasticsearch/Dockerfile b/elasticsearch/Dockerfile index 3928544..22528c6 100644 --- a/elasticsearch/Dockerfile +++ b/elasticsearch/Dockerfile @@ -1,7 +1,7 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION} +FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} # Add your elasticsearch plugins setup here # Example: RUN elasticsearch-plugin install analysis-icu diff --git a/extensions/apm-server/Dockerfile b/extensions/apm-server/Dockerfile index 2c611df..9f03f56 100644 --- a/extensions/apm-server/Dockerfile +++ b/extensions/apm-server/Dockerfile @@ -1,3 +1,3 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION -FROM docker.elastic.co/apm/apm-server:${ELK_VERSION} +FROM docker.elastic.co/apm/apm-server:${ELASTIC_VERSION} diff --git a/extensions/apm-server/apm-server-compose.yml b/extensions/apm-server/apm-server-compose.yml index 88bd73b..b951d4b 100644 --- a/extensions/apm-server/apm-server-compose.yml +++ b/extensions/apm-server/apm-server-compose.yml @@ -5,7 +5,7 @@ services: build: context: extensions/apm-server/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} command: # Disable strict permission checking on 'apm-server.yml' configuration file # https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html diff --git a/extensions/enterprise-search/Dockerfile b/extensions/enterprise-search/Dockerfile index 7edd720..4f0752e 100644 --- a/extensions/enterprise-search/Dockerfile +++ b/extensions/enterprise-search/Dockerfile @@ -1,4 +1,4 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/enterprise-search/enterprise-search:${ELK_VERSION} +FROM docker.elastic.co/enterprise-search/enterprise-search:${ELASTIC_VERSION} diff --git a/extensions/enterprise-search/enterprise-search-compose.yml b/extensions/enterprise-search/enterprise-search-compose.yml index 90404ba..5b9e9fe 100644 --- a/extensions/enterprise-search/enterprise-search-compose.yml +++ b/extensions/enterprise-search/enterprise-search-compose.yml @@ -5,7 +5,7 @@ services: build: context: extensions/enterprise-search/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} volumes: - ./extensions/enterprise-search/config/enterprise-search.yml:/usr/share/enterprise-search/config/enterprise-search.yml:ro,Z environment: diff --git a/extensions/filebeat/Dockerfile b/extensions/filebeat/Dockerfile index b70aa10..b8dd5f3 100644 --- a/extensions/filebeat/Dockerfile +++ b/extensions/filebeat/Dockerfile @@ -1,3 +1,3 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/filebeat:${ELK_VERSION} +FROM docker.elastic.co/beats/filebeat:${ELASTIC_VERSION} diff --git a/extensions/filebeat/filebeat-compose.yml b/extensions/filebeat/filebeat-compose.yml index 2e2ae16..020336e 100644 --- a/extensions/filebeat/filebeat-compose.yml +++ b/extensions/filebeat/filebeat-compose.yml @@ -5,7 +5,7 @@ services: build: context: extensions/filebeat/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} # Run as 'root' instead of 'filebeat' (uid 1000) to allow reading # 'docker.sock' and the host's filesystem. user: root diff --git a/extensions/metricbeat/Dockerfile b/extensions/metricbeat/Dockerfile index e55f625..6d05bf5 100644 --- a/extensions/metricbeat/Dockerfile +++ b/extensions/metricbeat/Dockerfile @@ -1,3 +1,3 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION -FROM docker.elastic.co/beats/metricbeat:${ELK_VERSION} +FROM docker.elastic.co/beats/metricbeat:${ELASTIC_VERSION} diff --git a/extensions/metricbeat/metricbeat-compose.yml b/extensions/metricbeat/metricbeat-compose.yml index 8513958..7777887 100644 --- a/extensions/metricbeat/metricbeat-compose.yml +++ b/extensions/metricbeat/metricbeat-compose.yml @@ -5,7 +5,7 @@ services: build: context: extensions/metricbeat/ args: - ELK_VERSION: ${ELK_VERSION} + ELASTIC_VERSION: ${ELASTIC_VERSION} # Run as 'root' instead of 'metricbeat' (uid 1000) to allow reading # 'docker.sock' and the host's filesystem. user: root diff --git a/kibana/Dockerfile b/kibana/Dockerfile index 2fb3659..9a075be 100644 --- a/kibana/Dockerfile +++ b/kibana/Dockerfile @@ -1,7 +1,7 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/kibana/kibana:${ELK_VERSION} +FROM docker.elastic.co/kibana/kibana:${ELASTIC_VERSION} # Add your kibana plugins setup here # Example: RUN kibana-plugin install diff --git a/logstash/Dockerfile b/logstash/Dockerfile index 6a444e7..bde5808 100644 --- a/logstash/Dockerfile +++ b/logstash/Dockerfile @@ -1,7 +1,7 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/logstash/logstash:${ELK_VERSION} +FROM docker.elastic.co/logstash/logstash:${ELASTIC_VERSION} # Add your logstash plugins setup here # Example: RUN logstash-plugin install logstash-filter-json diff --git a/setup/Dockerfile b/setup/Dockerfile index 6c93058..21f16e8 100644 --- a/setup/Dockerfile +++ b/setup/Dockerfile @@ -1,7 +1,7 @@ -ARG ELK_VERSION +ARG ELASTIC_VERSION # https://www.docker.elastic.co/ -FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION} +FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION} USER root RUN mkdir /state && chown elasticsearch /state