Skip to content

Commit fa31478

Browse files
authored
FTS doesn't support latest tag (erm kind of...) (#2566)
1 parent 586c140 commit fa31478

File tree

3 files changed

+4
-1
lines changed

3 files changed

+4
-1
lines changed

apps/fulltextsearch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ cat << YML_DOCKER_COMPOSE > "$FULLTEXTSEARCH_DIR/docker-compose.yaml"
115115
version: '3'
116116
services:
117117
elasticsearch:
118-
image: docker.elastic.co/elasticsearch/elasticsearch:latest
118+
image: docker.elastic.co/elasticsearch/elasticsearch:$FULLTEXTSEARCH_IMAGE_NAME_LATEST_TAG
119119
container_name: $FULLTEXTSEARCH_IMAGE_NAME
120120
restart: always
121121
ports:

lib.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@ fulltextsearch_install() {
177177
ELASTIC_USER_PASSWORD=$(gen_passwd "$SHUF" '[:lower:]')
178178
FULLTEXTSEARCH_IMAGE_NAME=fulltextsearch_es01
179179
FULLTEXTSEARCH_SERVICE=nextcloud-fulltext-elasticsearch-worker.service
180+
# 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.
181+
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)"
180182
# Legacy, changed 2023-09-21
181183
DOCKER_IMAGE_NAME=es01
182184
# Legacy, not used at all

nextcloud_update.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -664,6 +664,7 @@ $DOCKER_RUN_OUTPUT"
664664
# Check if new name standard is set, and only update if it is (since it contains the latest tag)
665665
if grep -rq "$FULLTEXTSEARCH_IMAGE_NAME" "$FULLTEXTSEARCH_DIR/docker-compose.yaml"
666666
then
667+
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"
667668
docker-compose_update "$FULLTEXTSEARCH_IMAGE_NAME" 'Full Text Search' "$FULLTEXTSEARCH_DIR"
668669
else
669670
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"

0 commit comments

Comments
 (0)