From f111c32c1eb811540d03a552597badb4c76a7d8f Mon Sep 17 00:00:00 2001
From: Benjamin Gandon <benjamin@gstack.io>
Date: Wed, 15 Dec 2021 02:18:46 +0100
Subject: [PATCH] Re-generate pipeline from latest template

---
 ci/pipeline.yml                    | 47 +++++++++++++++---------------
 ci/scripts/update-dockerhub-readme | 18 ++++++------
 ci/settings.yml                    |  3 --
 3 files changed, 32 insertions(+), 36 deletions(-)

diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 9071b06..95bae37 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -87,10 +87,10 @@ jobs:
         privileged: true
         config:
           platform: linux
-          inputs:   [ { name: git, path: "." } ]
-          outputs:  [ name: image ]
-          caches:   [ path: cache ]
-          run:      { path: build }
+          inputs:  [ { name: git, path: "." } ]
+          outputs: [ name: image ]
+          caches:  [ path: cache ]
+          run:     { path: build }
 
       - put: edge
         inputs: [ image ]
@@ -123,10 +123,10 @@ jobs:
         privileged: true
         config:
           platform: linux
-          inputs:   [ { name: git-pull-requests, path: "." } ]
-          outputs:  [ name: image ]
-          caches:   [ path: cache ]
-          run:      { path: build }
+          inputs:  [ { name: git-pull-requests, path: "." } ]
+          outputs: [ name: image ]
+          caches:  [ path: cache ]
+          run:     { path: build }
         on_success:
           put: git-pull-requests
           params:
@@ -171,7 +171,7 @@ jobs:
     plan:
       - in_parallel:
           - { get: edge,    trigger: true, passed: [ build ] }
-          - { get: git,                    passed: [ build ] }
+          - { get: git,     trigger: true, passed: [ build ] }
           - { get: version, trigger: true }
           - { get: image }
       - task: release-notes
@@ -213,7 +213,7 @@ jobs:
     plan:
       - in_parallel:
           - { get: edge,    trigger: true, passed: [ pre ] }
-          - { get: git,                    passed: [ pre ] }
+          - { get: git,     trigger: true, passed: [ pre ] }
           - { get: version, params: { pre: rc } }
       - put: version
         params: {file: version/number}
@@ -288,13 +288,25 @@ jobs:
 
       - load_var: version
         file: version/number
-
       - put: latest
         inputs: [ edge ]
         params:
           image:        edge/image.tar
           version:      ((.:version))
           bump_aliases: true
+      - task: update-dockerhub-readme
+        image: image
+        config:
+          platform: linux
+          inputs:
+            - name: git
+            - name: dockerhub
+          run:
+            path: ./git/ci/scripts/update-dockerhub-readme
+        params:
+          DOCKERHUB_USERNAME:   (( grab meta.dockerhub.username ))
+          DOCKERHUB_PASSWORD:   (( grab meta.dockerhub.password ))
+          DOCKERHUB_REPOSITORY: (( grab meta.dockerhub.repository ))
 
       - put: version
         params:
@@ -308,19 +320,6 @@ jobs:
           name: gh/name
           tag:  gh/tag
           body: gh/notes.md
-
-      - task: update-dockerhub-readme
-        image: image
-        config:
-          platform: linux
-          inputs:
-            - name: dockerhub
-          run:
-            path: ./git/ci/scripts/update-dockerhub-readme
-        params:
-          DOCKERHUB_USERNAME:   (( grab meta.dockerhub.username ))
-          DOCKERHUB_PASSWORD:   (( grab meta.dockerhub.password ))
-          DOCKERHUB_REPOSITORY: (( grab meta.dockerhub.repository ))
     on_failure:
       put: notify
       params:
diff --git a/ci/scripts/update-dockerhub-readme b/ci/scripts/update-dockerhub-readme
index f047f8c..be4530c 100755
--- a/ci/scripts/update-dockerhub-readme
+++ b/ci/scripts/update-dockerhub-readme
@@ -13,10 +13,10 @@ payload=$(jq --null-input \
     '{ "username": $username, "password": $password }')
 
 curl --silent --fail --show-error --location \
-    --request="POST" \
-    --url="https://hub.docker.com/v2/users/login" \
-    --header="Content-Type: application/json" \
-    --data-raw="${payload}" \
+    --request "POST" \
+    --url "https://hub.docker.com/v2/users/login" \
+    --header "Content-Type: application/json" \
+    --data-raw "${payload}" \
   > ./token.json
 
 payload=$(jq --null-input \
@@ -24,8 +24,8 @@ payload=$(jq --null-input \
     '{ "full_description": $full_description }')
 
 curl --silent --fail --show-error --location --include \
-    --request="PATCH" \
-    --url="https://hub.docker.com/v2/repositories/${DOCKERHUB_REPOSITORY}" \
-    --header="Content-Type: application/json" \
-    --header="Authorization: JWT $(jq --raw-output '.token' ./token.json)" \
-    --data-raw="${payload}"
+    --request "PATCH" \
+    --url "https://hub.docker.com/v2/repositories/${DOCKERHUB_REPOSITORY}" \
+    --header "Content-Type: application/json" \
+    --header "Authorization: JWT $(jq --raw-output '.token' ./token.json)" \
+    --data-raw "${payload}"
diff --git a/ci/settings.yml b/ci/settings.yml
index fb8923c..2f07d24 100644
--- a/ci/settings.yml
+++ b/ci/settings.yml
@@ -72,9 +72,6 @@ jobs:
       - {} # task: release
       - {} # load_var: version
       - {} # put: latest
-      - {} # put: version
-      - {} # put: git
-      - {} # put: github
 
       - task: update-dockerhub-readme
         params: