From 987aff046893ac4cebc0bcda97400da315fe2178 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Thu, 12 Sep 2024 22:02:48 +0200 Subject: [PATCH 01/14] Basic test for schedule --- .gitlab-ci.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc6c35f..5c4c7ec 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,3 +11,19 @@ build: - docker push $IMAGE_TAG rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == "schedule" + when: never + +build:schedule: + stage: build + tags: + - docker + - linux + variables: + IMAGE_TAG: $CI_REGISTRY_IMAGE:latest + script: + - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin + - docker pull $IMAGE_TAG + - docker image inspect $IMAGE_TAG + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" -- GitLab From ba52c7779b460ea7419f7b0d5dd2690551c5c8ea Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:42:12 +0200 Subject: [PATCH 02/14] Test new build --- .gitlab-ci.yml | 38 ++++++++++++++++++++++++-------------- Dockerfile | 7 ++++++- 2 files changed, 30 insertions(+), 15 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c4c7ec..35736e9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,25 +5,35 @@ build: - linux variables: IMAGE_TAG: $CI_REGISTRY_IMAGE:latest + PARENT_IMAGE: searxng/searxng:latest script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - - docker build -t $IMAGE_TAG . + - curl -L --output /usr/local/bin/jq "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64" + - docker pull $PARENT_IMAGE + - TAG_HASH=`docker image inspect searxng/searxng:latest | /usr/local/bin/jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` + - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - docker push $IMAGE_TAG rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == "schedule" when: never -build:schedule: - stage: build - tags: - - docker - - linux - variables: - IMAGE_TAG: $CI_REGISTRY_IMAGE:latest - script: - - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - - docker pull $IMAGE_TAG - - docker image inspect $IMAGE_TAG - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" +#build:schedule: +# stage: build +# tags: +# - docker +# - linux +# variables: +# IMAGE_TAG: $CI_REGISTRY_IMAGE:latest +# PARENT_IMAGE: searxng/searxng:latest +# script: +# - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin +# #- docker pull $PARENT_IMAGE +# #- docker image inspect searxng/searxng | jq .[0].RepoDigests > UPSTREAM_DIGEST +# - docker pull $IMAGE_TAG +# - docker image inspect $IMAGE_TAG +# # +# # - TOKEN=`curl https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull | jq '.access_token'` +# # - ETAG=`curl --oauth2-bearer "$TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:'` +# rules: +# - if: $CI_PIPELINE_SOURCE == "schedule" diff --git a/Dockerfile b/Dockerfile index 8817e36..639bf59 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,9 @@ -FROM searxng/searxng:latest +ARG SEARXNGIMAGE +FROM searxng/searxng@${SEARXNGIMAGE} + +ARG SEARXNGIMAGE +MAINTAINER Lukas Schreiner +LABEL eu.monobear.searxng.upstream=${SEARXNGIMAGE} RUN apk add git && \ pip3 install --break-system-packages --no-cache git+https://git.monobear.eu/monobear/searxng/searxng-qrcode.git && \ apk del git && \ -- GitLab From bcf9cb993fa749f4321c6f2961effd75315cdc81 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:43:22 +0200 Subject: [PATCH 03/14] Test new build --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 35736e9..f6c788f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,9 +12,13 @@ build: - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | /usr/local/bin/jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - - docker push $IMAGE_TAG + - | + if [[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]]; then + docker push $IMAGE_TAG + fi rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + - if: $CI_PIPELINE_SOURCE == 'merge_request_event' - if: $CI_PIPELINE_SOURCE == "schedule" when: never -- GitLab From 8b8b210666e8edfd05e3706cfbeb52a979b69018 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:44:25 +0200 Subject: [PATCH 04/14] Test new build --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f6c788f..626cb77 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,6 +8,7 @@ build: PARENT_IMAGE: searxng/searxng:latest script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin + - apk install curl - curl -L --output /usr/local/bin/jq "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64" - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | /usr/local/bin/jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` -- GitLab From 4f8f0a078a779629722e3d0e39f63e4806035b88 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:45:38 +0200 Subject: [PATCH 05/14] Test new build --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 626cb77..dade998 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -8,8 +8,7 @@ build: PARENT_IMAGE: searxng/searxng:latest script: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - - apk install curl - - curl -L --output /usr/local/bin/jq "https://github.com/jqlang/jq/releases/download/jq-1.7.1/jq-linux64" + - apk add curl jq - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | /usr/local/bin/jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . -- GitLab From 129d80e552d649aace1174ff987fc2889ceadfe2 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:46:13 +0200 Subject: [PATCH 06/14] Test new build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dade998..86f3dfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -10,7 +10,7 @@ build: - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin - apk add curl jq - docker pull $PARENT_IMAGE - - TAG_HASH=`docker image inspect searxng/searxng:latest | /usr/local/bin/jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` + - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - | if [[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]]; then -- GitLab From a8341d44d1446af25051dfc5cbfd13b21f83c8d3 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 06:47:21 +0200 Subject: [PATCH 07/14] Test new build --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 86f3dfb..b3dd012 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -13,7 +13,7 @@ build: - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - | - if [[ $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH ]]; then + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then docker push $IMAGE_TAG fi rules: -- GitLab From 849f1ed96f8685aa6c4cd9e8d7cb7aa782756ecc Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:43:25 +0200 Subject: [PATCH 08/14] Add schedule job --- .gitlab-ci.yml | 46 +++++++++++++++++++++++++++------------------- 1 file changed, 27 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b3dd012..9f9ad05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,22 +22,30 @@ build: - if: $CI_PIPELINE_SOURCE == "schedule" when: never -#build:schedule: -# stage: build -# tags: -# - docker -# - linux -# variables: -# IMAGE_TAG: $CI_REGISTRY_IMAGE:latest -# PARENT_IMAGE: searxng/searxng:latest -# script: -# - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin -# #- docker pull $PARENT_IMAGE -# #- docker image inspect searxng/searxng | jq .[0].RepoDigests > UPSTREAM_DIGEST -# - docker pull $IMAGE_TAG -# - docker image inspect $IMAGE_TAG -# # -# # - TOKEN=`curl https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull | jq '.access_token'` -# # - ETAG=`curl --oauth2-bearer "$TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:'` -# rules: -# - if: $CI_PIPELINE_SOURCE == "schedule" +build:schedule: + stage: build + tags: + - docker + - linux + variables: + IMAGE_TAG: $CI_REGISTRY_IMAGE:latest + PARENT_IMAGE: searxng/searxng:latest + script: + - echo "$CI_REGISTRY_PASSWORD" | docker login $CI_REGISTRY -u $CI_REGISTRY_USER --password-stdin + - apk add curl jq + - docker pull $IMAGE_TAG + - LOCAL_IMAGE=`docker image inspect $IMAGE_TAG | jq -r '.[0].Config.Labels."eu.monobear.searxng.upstream"'` + - DOCKER_HUB_TOKEN=`curl 'https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull' | jq -r '.access_token'` + - | + REMOTE_ETAG=`curl -XHEAD --oauth2-bearer "$DOCKER_HUB_TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:' | sed 's/etag: "\(.*\)"/\1/'` + - | + if [[ "$REMOTE_ETAG" != "$LOCAL_IMAGE" ]]; then + docker pull $PARENT_IMAGE + TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` + docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + docker push $IMAGE_TAG + fi + fi + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" -- GitLab From 0548a3728bfeacae9504072e2543f8c43ce03c43 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:46:37 +0200 Subject: [PATCH 09/14] Add schedule job --- .gitlab-ci.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9f9ad05..299e45d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -37,15 +37,20 @@ build:schedule: - LOCAL_IMAGE=`docker image inspect $IMAGE_TAG | jq -r '.[0].Config.Labels."eu.monobear.searxng.upstream"'` - DOCKER_HUB_TOKEN=`curl 'https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull' | jq -r '.access_token'` - | - REMOTE_ETAG=`curl -XHEAD --oauth2-bearer "$DOCKER_HUB_TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:' | sed 's/etag: "\(.*\)"/\1/'` + REMOTE_ETAG=`curl --head --oauth2-bearer "$DOCKER_HUB_TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:' | sed 's/etag: "\(.*\)"/\1/'` - | + echo "Tags: >${LOCAL_IMAGE}< / >${REMOTE_ETAG}<" if [[ "$REMOTE_ETAG" != "$LOCAL_IMAGE" ]]; then + echo "Pull ${PARENT_IMAGE}" docker pull $PARENT_IMAGE TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` + echo "New hash for base: ${TAG_HASH}" docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then docker push $IMAGE_TAG fi + else + echo "Tags are same" fi rules: - if: $CI_PIPELINE_SOURCE == "schedule" -- GitLab From 7b1e57f8f8d90ef9d00172bf1ce73955b5be1c36 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:50:07 +0200 Subject: [PATCH 10/14] Add schedule job --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 299e45d..fe5b52d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,13 +35,14 @@ build:schedule: - apk add curl jq - docker pull $IMAGE_TAG - LOCAL_IMAGE=`docker image inspect $IMAGE_TAG | jq -r '.[0].Config.Labels."eu.monobear.searxng.upstream"'` + - echo "Local image upstream tag is $LOCAL_IMAGE" - DOCKER_HUB_TOKEN=`curl 'https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull' | jq -r '.access_token'` - | REMOTE_ETAG=`curl --head --oauth2-bearer "$DOCKER_HUB_TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:' | sed 's/etag: "\(.*\)"/\1/'` + echo "Remote tag is $REMOTE_ETAG" - | - echo "Tags: >${LOCAL_IMAGE}< / >${REMOTE_ETAG}<" if [[ "$REMOTE_ETAG" != "$LOCAL_IMAGE" ]]; then - echo "Pull ${PARENT_IMAGE}" + echo "Pull ${PARENT_IMAGE} as differ" docker pull $PARENT_IMAGE TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` echo "New hash for base: ${TAG_HASH}" -- GitLab From 8a04821d0d34d1efbf59f51384a3b5fc5a34fac2 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:52:08 +0200 Subject: [PATCH 11/14] Add schedule job --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fe5b52d..e7475b1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,10 +12,10 @@ build: - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - - | - if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - docker push $IMAGE_TAG - fi + #- | + # if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + # docker push $IMAGE_TAG + # fi rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' -- GitLab From 4ad8148bdc81453b68a149ecac13d70f0e032047 Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:53:28 +0200 Subject: [PATCH 12/14] Add schedule job --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7475b1..a51850d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -11,7 +11,7 @@ build: - apk add curl jq - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . + - docker build --no-cache --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . #- | # if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then # docker push $IMAGE_TAG @@ -46,7 +46,7 @@ build:schedule: docker pull $PARENT_IMAGE TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` echo "New hash for base: ${TAG_HASH}" - docker build --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . + docker build --no-cache --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then docker push $IMAGE_TAG fi -- GitLab From 79b99a3484f9dd17df6f15b9293e8287da79316f Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 12:55:54 +0200 Subject: [PATCH 13/14] Add schedule job --- .gitlab-ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a51850d..f345ff2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,6 +12,7 @@ build: - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --no-cache --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . + - docker push $IMAGE_TAG #- | # if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then # docker push $IMAGE_TAG -- GitLab From e8d9eb4754b286041567a04fb66e94fbb910748a Mon Sep 17 00:00:00 2001 From: Lukas Schreiner Date: Fri, 13 Sep 2024 13:04:09 +0200 Subject: [PATCH 14/14] Add schedule job --- .gitlab-ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f345ff2..18e9e2f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -12,11 +12,10 @@ build: - docker pull $PARENT_IMAGE - TAG_HASH=`docker image inspect searxng/searxng:latest | jq .[0].RepoDigests[0] | sed 's/"\(searxng\/searxng\)@\(.*\)"/\2/'` - docker build --no-cache --build-arg SEARXNGIMAGE=${TAG_HASH} -t $IMAGE_TAG . - - docker push $IMAGE_TAG - #- | - # if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then - # docker push $IMAGE_TAG - # fi + - | + if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then + docker push $IMAGE_TAG + fi rules: - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_PIPELINE_SOURCE == 'merge_request_event' @@ -40,6 +39,7 @@ build:schedule: - DOCKER_HUB_TOKEN=`curl 'https://auth.docker.io/token?service=registry.docker.io&scope=repository:searxng/searxng:pull' | jq -r '.access_token'` - | REMOTE_ETAG=`curl --head --oauth2-bearer "$DOCKER_HUB_TOKEN" -i 'https://index.docker.io/v2/searxng/searxng/manifests/latest' | grep 'etag:' | sed 's/etag: "\(.*\)"/\1/'` + REMOTE_ETAG=${REMOTE_ETAG//$'\r'/} echo "Remote tag is $REMOTE_ETAG" - | if [[ "$REMOTE_ETAG" != "$LOCAL_IMAGE" ]]; then -- GitLab