From e25a8ba485abf9fd17d55d004bd66592e0adfb27 Mon Sep 17 00:00:00 2001
From: Brian Clozel <bclozel@vmware.com>
Date: Wed, 28 Apr 2021 10:25:35 +0200
Subject: [PATCH] Update CI pipeline to use registry-image

This prevents docker rate-limiting issues.
---
 .../Dockerfile                                |  0
 ci/pipeline.yml                               | 30 +++++++++++--------
 ci/tasks/build-ci-image.yml                   | 26 ++++++++++++++++
 3 files changed, 44 insertions(+), 12 deletions(-)
 rename ci/images/{spring-graphql-ci-image => ci-image}/Dockerfile (100%)
 create mode 100644 ci/tasks/build-ci-image.yml

diff --git a/ci/images/spring-graphql-ci-image/Dockerfile b/ci/images/ci-image/Dockerfile
similarity index 100%
rename from ci/images/spring-graphql-ci-image/Dockerfile
rename to ci/images/ci-image/Dockerfile
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index 5b20a907..c8b85448 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -10,7 +10,7 @@ anchors:
 
 resource_types:
 - name: artifactory-resource
-  type: docker-image
+  type: registry-image
   source:
     repository: springio/artifactory-resource
     tag: 0.0.12
@@ -32,8 +32,8 @@ resources:
     uri: ((github-repo))
     branch: ((branch))
     paths: ["ci/images/*"]
-- name: spring-graphql-ci-image
-  type: docker-image
+- name: ci-image
+  type: registry-image
   icon: docker
   source:
     <<: *docker-resource-source
@@ -48,27 +48,33 @@ resources:
     build_name: ((build-name))
 
 jobs:
-- name: build-spring-graphql-ci-images
+- name: build-ci-images
   plan:
+  - get: git-repo
   - get: ci-images-git-repo
     trigger: true
-  - in_parallel:
-    - put: spring-graphql-ci-image
-      params:
-        build: ci-images-git-repo/ci/images
-        dockerfile: ci-images-git-repo/ci/images/spring-graphql-ci-image/Dockerfile
+  - task: build-ci-image
+    privileged: true
+    file: git-repo/ci/tasks/build-ci-image.yml
+    output_mapping:
+      image: ci-image
+    vars:
+      ci-image-name: ci-image
+  - put: ci-image
+    params:
+      image: ci-image/image.tar
 - name: build
   serial: true
   public: true
   plan:
-  - get: spring-graphql-ci-image
+  - get: ci-image
   - get: git-repo
     trigger: true
   - do:
     - task: build-project
       privileged: true
       timeout: ((task-timeout))
-      image: spring-graphql-ci-image
+      image: ci-image
       file: git-repo/ci/tasks/build-project.yml
       params:
         BRANCH: ((branch))
@@ -88,4 +94,4 @@ groups:
 - name: "builds"
   jobs: ["build"]
 - name: "ci-images"
-  jobs: ["build-spring-graphql-ci-images"]
+  jobs: ["build-ci-images"]
diff --git a/ci/tasks/build-ci-image.yml b/ci/tasks/build-ci-image.yml
new file mode 100644
index 00000000..30b2df98
--- /dev/null
+++ b/ci/tasks/build-ci-image.yml
@@ -0,0 +1,26 @@
+---
+platform: linux
+image_resource:
+  type: registry-image
+  source:
+    repository: vito/oci-build-task
+inputs:
+- name: ci-images-git-repo
+outputs:
+- name: image
+caches:
+- path: ci-image-cache
+params:
+  CONTEXT: ci-images-git-repo/ci/images
+  DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
+  DOCKER_HUB_AUTH: ((docker-hub-auth))
+run:
+  path: /bin/sh
+  args:
+  - "-c"
+  - |
+    mkdir -p /root/.docker
+    cat > /root/.docker/config.json <<EOF
+    { "auths": { "https://index.docker.io/v1/": { "auth": "$DOCKER_HUB_AUTH" }}}
+    EOF
+    build