archive/blender-cloud
0
1
Fork 1
Code Issues 24 Pull Requests Projects Releases Wiki Activity

Upgraded ElasticSearch and Kibana to 6.1.1

Browse Source 
Requires a reset + reindex of everything (well, that's the easiest way to
get things indexed properly again), which will loose us the Cloud stats.
Before doing this, export those to MongDB and upgrade the statscollector
to the version that I'll be committing soon.
This commit is contained in:
Sybren A. Stüvel
2018-01-11 11:20:18 +01:00
parent eb2a058ce2
commit 37b84cf75a
4 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docker/docker-compose.yml
View File

@@ -25,7 +25,7 @@ services:
- "127.0.0.1:5672:5672" - "127.0.0.1:5672:5672"
elastic: elastic:
image: armadillica/elasticsearch:latest image: armadillica/elasticsearch:6.1.1
container_name: elastic container_name: elastic
restart: always restart: always
volumes: volumes:
@@ -45,7 +45,7 @@ services:
- elastic - elastic
kibana: kibana:
image: armadillica/kibana:latest image: armadillica/kibana:6.1.1
container_name: kibana container_name: kibana
restart: always restart: always
environment: environment:

2
docker/elastic/Dockerfile-elastic
View File

@@ -1,4 +1,4 @@
FROM docker.elastic.co/elasticsearch/elasticsearch:5.6.1 FROM docker.elastic.co/elasticsearch/elasticsearch:6.1.1
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio> LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
RUN elasticsearch-plugin remove --purge x-pack RUN elasticsearch-plugin remove --purge x-pack

2
docker/elastic/Dockerfile-kibana
View File

@@ -1,4 +1,4 @@
FROM docker.elastic.co/kibana/kibana:5.6.1 FROM docker.elastic.co/kibana/kibana:6.1.1
LABEL maintainer Sybren A. Stüvel <sybren@blender.studio> LABEL maintainer Sybren A. Stüvel <sybren@blender.studio>
RUN bin/kibana-plugin remove x-pack RUN bin/kibana-plugin remove x-pack

15
docker/elastic/build.sh
View File

@@ -1,6 +1,15 @@
#!/bin/bash -e #!/bin/bash -e
docker build -t armadillica/elasticsearch:latest -f Dockerfile-elastic . # When updating this, also update the versions in Dockerfile-*, and make sure that
docker build -t armadillica/kibana:latest -f Dockerfile-kibana . # it matches the versions of the elasticsearch and elasticsearch_dsl packages
# used in Pillar. Those don't have to match exactly, but the major version should.
VERSION=6.1.1
echo "Done, built armadillica/elasticsearch:latest and armadillica/kibana:latest" docker build -t armadillica/elasticsearch:${VERSION} -f Dockerfile-elastic .
docker build -t armadillica/kibana:${VERSION} -f Dockerfile-kibana .
docker tag armadillica/elasticsearch:${VERSION} armadillica/elasticsearch:latest
docker tag armadillica/kibana:${VERSION} armadillica/kibana:latest
echo "Done, built armadillica/elasticsearch:${VERSION} and armadillica/kibana:${VERSION}"
echo "Also tagged as armadillica/elasticsearch:latest and armadillica/kibana:latest"