From 4362406587b1a7c882882832bcddb3b508459d9e Mon Sep 17 00:00:00 2001 From: Simon L Date: Thu, 16 Feb 2023 17:38:45 +0100 Subject: [PATCH] fix the helm-update job Signed-off-by: Simon L --- .github/workflows/update-helm.yml | 2 +- helm-chart/update-helm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-helm.yml b/.github/workflows/update-helm.yml index d6c8d6f2..007141f9 100644 --- a/.github/workflows/update-helm.yml +++ b/.github/workflows/update-helm.yml @@ -15,7 +15,7 @@ jobs: - name: update helm chart run: | DOCKER_TAG="$(curl -L -s 'https://registry.hub.docker.com/v2/repositories/nextcloud/all-in-one/tags?page_size=1024' | jq '."results"[]["name"]' | sed 's|"||g' | grep '^20' | sort -r | head -1)" - DOCKER_TAG="${DOCKER_TAG%%latest*}" + DOCKER_TAG="${DOCKER_TAG%%-latest*}" export DOCKER_TAG if [ -n "$DOCKER_TAG" ] && ! grep -q "$DOCKER_TAG" ./helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml; then sudo bash helm-chart/update-helm.sh "$DOCKER_TAG" diff --git a/helm-chart/update-helm.sh b/helm-chart/update-helm.sh index 0da0364d..1bb70b7f 100755 --- a/helm-chart/update-helm.sh +++ b/helm-chart/update-helm.sh @@ -22,7 +22,7 @@ sed -i 's|^|export |' /tmp/sample.conf # shellcheck disable=SC1091 source /tmp/sample.conf rm /tmp/sample.conf -sed -i "s|:latest$|$DOCKER_TAG-latest|" latest.yml +sed -i "s|:latest$|:$DOCKER_TAG-latest|" latest.yml sed -i "s|\${APACHE_IP_BINDING}:||" latest.yml sed -i "s|\${APACHE_PORT}:\${APACHE_PORT}/|$APACHE_PORT:$APACHE_PORT/|" latest.yml sed -i "s|\${TALK_PORT}:\${TALK_PORT}/|$TALK_PORT:$TALK_PORT/|g" latest.yml