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.
This commit is contained in:
Antoine Cotten 2022-02-28 09:10:30 +01:00
parent 0a9c3ebd2c
commit eb1c6fa27e
No known key found for this signature in database
GPG Key ID: 94637E68D4A79DD0
15 changed files with 26 additions and 26 deletions

2
.env
View File

@ -1,4 +1,4 @@
ELK_VERSION=8.0.0
ELASTIC_VERSION=8.0.0
## Passwords for stack users
#

View File

@ -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

View File

@ -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:

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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}

View File

@ -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:

View File

@ -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}

View File

@ -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

View File

@ -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}

View File

@ -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

View File

@ -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 <name|url>

View File

@ -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

View File

@ -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