From fa3147834618ab79b58cf8b27f872012c595edaf Mon Sep 17 00:00:00 2001 From: Daniel Hansson Date: Thu, 21 Sep 2023 14:46:01 +0200 Subject: [PATCH] FTS doesn't support latest tag (erm kind of...) (#2566) --- apps/fulltextsearch.sh | 2 +- lib.sh | 2 ++ nextcloud_update.sh | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/fulltextsearch.sh b/apps/fulltextsearch.sh index f2f1b177..fa66a8e9 100644 --- a/apps/fulltextsearch.sh +++ b/apps/fulltextsearch.sh @@ -115,7 +115,7 @@ cat << YML_DOCKER_COMPOSE > "$FULLTEXTSEARCH_DIR/docker-compose.yaml" version: '3' services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:latest + image: docker.elastic.co/elasticsearch/elasticsearch:$FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG container_name: $FULLTEXTSEARCH_IMAGE_NAME restart: always ports: diff --git a/lib.sh b/lib.sh index b9e00f99..64f926e7 100644 --- a/lib.sh +++ b/lib.sh @@ -177,6 +177,8 @@ fulltextsearch_install() { ELASTIC_USER_PASSWORD=$(gen_passwd "$SHUF" '[:lower:]') FULLTEXTSEARCH_IMAGE_NAME=fulltextsearch_es01 FULLTEXTSEARCH_SERVICE=nextcloud-fulltext-elasticsearch-worker.service + # 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. + FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG="$(curl -s -m 900 https://www.docker.elastic.co/r/elasticsearch | grep -Eo "[[:digit:]]\\.[[:digit:]][[:digit:]]\\.[[:digit:]]" | sort --version-sort | tail -1)" # Legacy, changed 2023-09-21 DOCKER_IMAGE_NAME=es01 # Legacy, not used at all diff --git a/nextcloud_update.sh b/nextcloud_update.sh index 73b5124c..748dae54 100644 --- a/nextcloud_update.sh +++ b/nextcloud_update.sh @@ -664,6 +664,7 @@ $DOCKER_RUN_OUTPUT" # Check if new name standard is set, and only update if it is (since it contains the latest tag) if grep -rq "$FULLTEXTSEARCH_IMAGE_NAME" "$FULLTEXTSEARCH_DIR/docker-compose.yaml" then + sed -i "s|image: docker.elastic.co/elasticsearch/elasticsearch:.*|image: docker.elastic.co/elasticsearch/elasticsearch:$FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG|g" "$FULLTEXTSEARCH_DIR/docker-compose.yaml" docker-compose_update "$FULLTEXTSEARCH_IMAGE_NAME" 'Full Text Search' "$FULLTEXTSEARCH_DIR" else print_text_in_color "$ICyan" "Full Text Search is version based, to upgrade it, please change the version in $FULLTEXTSEARCH_DIR and run 'docker compose pull && docker compose up -d'. Latest tags are here: https://www.docker.elastic.co/r/elasticsearch and release notes here: https://www.elastic.co/guide/en/elasticsearch/reference/current/release-highlights.html"