From d0527aaa7126a564cf7b4ade1688f8e1c383c0b3 Mon Sep 17 00:00:00 2001 From: Emily Casey Date: Tue, 26 Jan 2021 10:40:56 -0500 Subject: [PATCH] Avoid docker rate limiting errors in concourse Authenticated pulls of task images. Requires concourse with a security manager enabled and 'docker-username' and 'docker-password' secrets confirgured for the given pipeline. When building Dockerfile images, load base image from input resource to avoid pulling. Signed-off-by: Emily Casey --- ci/Dockerfile | 3 ++- ci/auto-merge.yml | 2 ++ ci/builder.yml | 6 +++++- ci/unit-test.yml | 2 ++ ci/versions-json.yml | 2 ++ ci/versions-markdown.yml | 2 ++ ci/versions-yaml.yml | 2 ++ ci/versions.yml | 2 ++ 8 files changed, 19 insertions(+), 2 deletions(-) diff --git a/ci/Dockerfile b/ci/Dockerfile index d5d8490a6a..98f6e18b6e 100644 --- a/ci/Dockerfile +++ b/ci/Dockerfile @@ -1,4 +1,5 @@ -FROM ubuntu:bionic +ARG base_image=ubuntu:bionic +FROM ${base_image} RUN apt-get update && apt-get install -y \ build-essential \ diff --git a/ci/auto-merge.yml b/ci/auto-merge.yml index a1fbfe2625..cb2af56905 100644 --- a/ci/auto-merge.yml +++ b/ci/auto-merge.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: downstream diff --git a/ci/builder.yml b/ci/builder.yml index 3f637a2ffa..7a37a1e1c4 100644 --- a/ci/builder.yml +++ b/ci/builder.yml @@ -4,10 +4,13 @@ platform: linux image_resource: type: registry-image source: - repository: concourse/builder + repository: vito/oci-build-task + username: ((docker-username)) + password: ((docker-password)) inputs: - name: builder +- name: base outputs: - name: image @@ -20,3 +23,4 @@ run: params: CONTEXT: builder/ci + IMAGE_ARG_base_image: base/image.tar diff --git a/ci/unit-test.yml b/ci/unit-test.yml index b367ff13be..21e547d0ff 100644 --- a/ci/unit-test.yml +++ b/ci/unit-test.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: java-buildpack diff --git a/ci/versions-json.yml b/ci/versions-json.yml index 69f283fa3d..8c35e603e4 100644 --- a/ci/versions-json.yml +++ b/ci/versions-json.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: java-buildpack diff --git a/ci/versions-markdown.yml b/ci/versions-markdown.yml index e8b68817f9..bb43e2e0be 100644 --- a/ci/versions-markdown.yml +++ b/ci/versions-markdown.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: java-buildpack diff --git a/ci/versions-yaml.yml b/ci/versions-yaml.yml index 46c45eb6aa..9ee7273d58 100644 --- a/ci/versions-yaml.yml +++ b/ci/versions-yaml.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: java-buildpack diff --git a/ci/versions.yml b/ci/versions.yml index 4a0401f01a..d150ba46b2 100644 --- a/ci/versions.yml +++ b/ci/versions.yml @@ -19,6 +19,8 @@ image_resource: type: registry-image source: repository: cfje/java-buildpack + username: ((docker-username)) + password: ((docker-password)) inputs: - name: java-buildpack