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:
parent
0a9c3ebd2c
commit
eb1c6fa27e
2
.env
2
.env
|
@ -1,4 +1,4 @@
|
||||||
ELK_VERSION=8.0.0
|
ELASTIC_VERSION=8.0.0
|
||||||
|
|
||||||
## Passwords for stack users
|
## Passwords for stack users
|
||||||
#
|
#
|
||||||
|
|
|
@ -65,7 +65,7 @@ jobs:
|
||||||
if: steps.get-latest-release.outputs.result
|
if: steps.get-latest-release.outputs.result
|
||||||
run: |
|
run: |
|
||||||
source .env
|
source .env
|
||||||
cur_ver="$ELK_VERSION"
|
cur_ver="$ELASTIC_VERSION"
|
||||||
new_ver=${{ fromJson(steps.get-latest-release.outputs.result).version }}
|
new_ver=${{ fromJson(steps.get-latest-release.outputs.result).version }}
|
||||||
|
|
||||||
# Escape dot characters so sed interprets them as literal dots
|
# Escape dot characters so sed interprets them as literal dots
|
||||||
|
|
|
@ -13,7 +13,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: setup/
|
context: setup/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- setup:/state:Z
|
- setup:/state:Z
|
||||||
environment:
|
environment:
|
||||||
|
@ -27,7 +27,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: elasticsearch/
|
context: elasticsearch/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,z
|
- ./elasticsearch/config/elasticsearch.yml:/usr/share/elasticsearch/config/elasticsearch.yml:ro,z
|
||||||
- elasticsearch:/usr/share/elasticsearch/data:z
|
- elasticsearch:/usr/share/elasticsearch/data:z
|
||||||
|
@ -50,7 +50,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: logstash/
|
context: logstash/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
|
- ./logstash/config/logstash.yml:/usr/share/logstash/config/logstash.yml:ro,Z
|
||||||
- ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z
|
- ./logstash/pipeline:/usr/share/logstash/pipeline:ro,Z
|
||||||
|
@ -71,7 +71,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: kibana/
|
context: kibana/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z
|
- ./kibana/config/kibana.yml:/usr/share/kibana/config/kibana.yml:ro,Z
|
||||||
ports:
|
ports:
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ARG ELK_VERSION
|
ARG ELASTIC_VERSION
|
||||||
|
|
||||||
# https://www.docker.elastic.co/
|
# 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
|
# Add your elasticsearch plugins setup here
|
||||||
# Example: RUN elasticsearch-plugin install analysis-icu
|
# Example: RUN elasticsearch-plugin install analysis-icu
|
||||||
|
|
|
@ -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}
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: extensions/apm-server/
|
context: extensions/apm-server/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
command:
|
command:
|
||||||
# Disable strict permission checking on 'apm-server.yml' configuration file
|
# Disable strict permission checking on 'apm-server.yml' configuration file
|
||||||
# https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
|
# https://www.elastic.co/guide/en/beats/libbeat/current/config-file-permissions.html
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
ARG ELK_VERSION
|
ARG ELASTIC_VERSION
|
||||||
|
|
||||||
# https://www.docker.elastic.co/
|
# 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}
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: extensions/enterprise-search/
|
context: extensions/enterprise-search/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
volumes:
|
volumes:
|
||||||
- ./extensions/enterprise-search/config/enterprise-search.yml:/usr/share/enterprise-search/config/enterprise-search.yml:ro,Z
|
- ./extensions/enterprise-search/config/enterprise-search.yml:/usr/share/enterprise-search/config/enterprise-search.yml:ro,Z
|
||||||
environment:
|
environment:
|
||||||
|
|
|
@ -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}
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: extensions/filebeat/
|
context: extensions/filebeat/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
# Run as 'root' instead of 'filebeat' (uid 1000) to allow reading
|
# Run as 'root' instead of 'filebeat' (uid 1000) to allow reading
|
||||||
# 'docker.sock' and the host's filesystem.
|
# 'docker.sock' and the host's filesystem.
|
||||||
user: root
|
user: root
|
||||||
|
|
|
@ -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}
|
||||||
|
|
|
@ -5,7 +5,7 @@ services:
|
||||||
build:
|
build:
|
||||||
context: extensions/metricbeat/
|
context: extensions/metricbeat/
|
||||||
args:
|
args:
|
||||||
ELK_VERSION: ${ELK_VERSION}
|
ELASTIC_VERSION: ${ELASTIC_VERSION}
|
||||||
# Run as 'root' instead of 'metricbeat' (uid 1000) to allow reading
|
# Run as 'root' instead of 'metricbeat' (uid 1000) to allow reading
|
||||||
# 'docker.sock' and the host's filesystem.
|
# 'docker.sock' and the host's filesystem.
|
||||||
user: root
|
user: root
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ARG ELK_VERSION
|
ARG ELASTIC_VERSION
|
||||||
|
|
||||||
# https://www.docker.elastic.co/
|
# 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
|
# Add your kibana plugins setup here
|
||||||
# Example: RUN kibana-plugin install <name|url>
|
# Example: RUN kibana-plugin install <name|url>
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ARG ELK_VERSION
|
ARG ELASTIC_VERSION
|
||||||
|
|
||||||
# https://www.docker.elastic.co/
|
# 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
|
# Add your logstash plugins setup here
|
||||||
# Example: RUN logstash-plugin install logstash-filter-json
|
# Example: RUN logstash-plugin install logstash-filter-json
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
ARG ELK_VERSION
|
ARG ELASTIC_VERSION
|
||||||
|
|
||||||
# https://www.docker.elastic.co/
|
# https://www.docker.elastic.co/
|
||||||
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELK_VERSION}
|
FROM docker.elastic.co/elasticsearch/elasticsearch:${ELASTIC_VERSION}
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
RUN mkdir /state && chown elasticsearch /state
|
RUN mkdir /state && chown elasticsearch /state
|
||||||
|
|
Loading…
Reference in New Issue