Skip to content

Commit 9996a8c

Browse files
authored
Fix FTS version check
Signed-off-by: Daniel Hansson <[email protected]>
1 parent 03ccaad commit 9996a8c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

lib.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,8 @@ fulltextsearch_install() {
184184
ELASTIC_USER_PASSWORD=$(gen_passwd "$SHUF" '[:lower:]')
185185
FULLTEXTSEARCH_IMAGE_NAME=fulltextsearch_es01
186186
FULLTEXTSEARCH_SERVICE=nextcloud-fulltext-elasticsearch-worker.service
187-
# Supports 0-9.0-99.0-9. Max supprted version with this function is 9.99.9. When ES 10.0.0 is out we have a problem.
188-
# Maybe "10\\.[[:digit:]][[:digit:]]\\.[[:digit:]]" will work?
189-
FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="$(curl -s -m 900 https://www.docker.elastic.co/r/elasticsearch?limit=500 | grep -Eo "[[:digit:]]\\.[[:digit:]][[:digit:]]\\.[[:digit:]]" | sort --version-sort | tail -1)"
187+
# Gets the version from the latest tag here: https://github.com/docker-library/official-images/blob/master/library/elasticsearch
188+
FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="$(https://raw.githubusercontent.com/docker-library/official-images/refs/heads/master/library/elasticsearch | grep "Tags:" | head -1 | awk '{print $2}')"
190189
# Legacy, changed 2023-09-21
191190
DOCKER_IMAGE_NAME=es01
192191
# Legacy, not used at all

0 commit comments

Comments
 (0)