From 7e60b46732109dffa780d754b5dc998c211626c6 Mon Sep 17 00:00:00 2001
From: t3chn0m4g3 <t3chn0m4g3@gmail.com>
Date: Thu, 26 Jan 2023 10:49:24 +0000
Subject: [PATCH] fixes #1254, fixes #1253

- #1254: new ELK images will be provided shortly
- #1253: documentation and updater will now reflect that an update from 20.06.x is no longer possible
---
 README.md                           | 9 ++-------
 docker/elk/elasticsearch/Dockerfile | 2 +-
 docker/elk/kibana/Dockerfile        | 2 +-
 docker/elk/logstash/Dockerfile      | 2 +-
 update.sh                           | 2 +-
 5 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6ad7a586..3319508f 100644
--- a/README.md
+++ b/README.md
@@ -561,13 +561,8 @@ The update script will ...
 
 
 ### **Update from 20.06.x**
-If you are running T-Pot 20.06.x you simply follow these commands ***after you backed up any relevant data***:
-```
-sudo su -
-cd /opt/tpot/
-wget -O update.sh https://raw.githubusercontent.com/telekom-security/tpotce/master/update.sh
-./update.sh
-```
+Due to massive changes in Elasticsearch automated updates from 20.06.x are no longer available. If you have not upgraded already a fresh install with 22.04.x is required.
+
 
 ### **Updates for 22.04.x**
 If you are already running T-Pot 22.04.x you simply run the update script ***after you backed up any relevant data***:
diff --git a/docker/elk/elasticsearch/Dockerfile b/docker/elk/elasticsearch/Dockerfile
index 26058fe9..4378ab22 100644
--- a/docker/elk/elasticsearch/Dockerfile
+++ b/docker/elk/elasticsearch/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV ES_VER=8.5.3
+ENV ES_VER=8.6.0
 #
 # Include dist
 COPY dist/ /root/dist/
diff --git a/docker/elk/kibana/Dockerfile b/docker/elk/kibana/Dockerfile
index 1ee1b33c..e108f39d 100644
--- a/docker/elk/kibana/Dockerfile
+++ b/docker/elk/kibana/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV KB_VER=8.5.3
+ENV KB_VER=8.6.0
 # Include dist
 COPY dist/ /root/dist/
 #
diff --git a/docker/elk/logstash/Dockerfile b/docker/elk/logstash/Dockerfile
index 34f970fc..a4ba7d91 100644
--- a/docker/elk/logstash/Dockerfile
+++ b/docker/elk/logstash/Dockerfile
@@ -1,7 +1,7 @@
 FROM ubuntu:22.04
 #
 # VARS
-ENV LS_VER=8.5.3
+ENV LS_VER=8.6.0
 # Include dist
 COPY dist/ /root/dist/
 #
diff --git a/update.sh b/update.sh
index fc809d98..321cb8c2 100755
--- a/update.sh
+++ b/update.sh
@@ -86,7 +86,7 @@ echo
 
 # Let's check for version, upgrade to Debian 11
 function fuCHECK_VERSION () {
-local myMINVERSION="20.06.0"
+local myMINVERSION="22.04.0"
 local myMASTERVERSION="22.04.0"
 echo
 echo "### Checking for Release ID"