提交 c8993c2c 编写于 作者: J Jesse Zhang

Replace docker-image with registry-image.

For context, the registry-image resource was introduced more than two
years ago as a drop-in replace for the docker-image resource (especially
when you're only fetching, not building). It's leaner, less
resource-intense, faster, and doesn't rely on spawning a Docker daemon.

Also swept up in this patch are four unused files that are left behind
by previous changes.

See https://github.com/concourse/registry-image-resource for more.

This is spiritually a cherry-pick of be6ff30f, but I'm only
touching the 5X_STABLE pipeline and the PR pipeline because they are in
my way of backporting 868fd2d7 and 6aac45f3
(clang-format check).
上级 472e263c
...@@ -308,17 +308,17 @@ groups: ...@@ -308,17 +308,17 @@ groups:
resource_types: resource_types:
- name: terraform - name: terraform
type: docker-image type: registry-image
source: source:
repository: ljfranklin/terraform-resource repository: ljfranklin/terraform-resource
tag: 0.11.14 tag: 0.11.14
- name: pivnet - name: pivnet
type: docker-image type: registry-image
source: source:
repository: pivotalcf/pivnet-resource repository: pivotalcf/pivnet-resource
tag: latest-final tag: latest-final
- name: gcs - name: gcs
type: docker-image type: registry-image
source: source:
repository: frodenas/gcs-resource repository: frodenas/gcs-resource
...@@ -338,7 +338,7 @@ resources: ...@@ -338,7 +338,7 @@ resources:
uri: {{ccp-git-remote}} uri: {{ccp-git-remote}}
- name: ccp-image - name: ccp-image
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -444,43 +444,43 @@ resources: ...@@ -444,43 +444,43 @@ resources:
uri: ((debian-release-git-remote)) uri: ((debian-release-git-remote))
- name: centos-gpdb-dev-6 - name: centos-gpdb-dev-6
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-gpdb-dev repository: pivotaldata/centos-gpdb-dev
tag: '6-gcc6.2-llvm3.7' tag: '6-gcc6.2-llvm3.7'
- name: centos-gpdb-dev-7 - name: centos-gpdb-dev-7
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-gpdb-dev repository: pivotaldata/centos-gpdb-dev
tag: 7-gcc6.2-llvm3.7 tag: 7-gcc6.2-llvm3.7
- name: oracle-gpdb-test-7 - name: oracle-gpdb-test-7
type: docker-image type: registry-image
source: source:
repository: pivotaldata/oracle7-test repository: pivotaldata/oracle7-test
tag: gpdb5-latest tag: gpdb5-latest
- name: ubuntu-gpdb-dev-16 - name: ubuntu-gpdb-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpdb-dev repository: pivotaldata/ubuntu-gpdb-dev
tag: '16.04' tag: '16.04'
- name: ubuntu16.04-test - name: ubuntu16.04-test
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu16.04-test repository: pivotaldata/ubuntu16.04-test
tag: gpdb5-latest tag: gpdb5-latest
- name: ubuntu-gpdb-debian-dev-16 - name: ubuntu-gpdb-debian-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpdb-debian-dev repository: pivotaldata/ubuntu-gpdb-debian-dev
tag: '16.04' tag: '16.04'
- name: ubuntu-gpcloud-dev-16 - name: ubuntu-gpcloud-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpcloud-dev repository: pivotaldata/ubuntu-gpcloud-dev
tag: '16.04' tag: '16.04'
...@@ -488,7 +488,7 @@ resources: ...@@ -488,7 +488,7 @@ resources:
password: {{docker_password}} password: {{docker_password}}
- name: centos-mingw - name: centos-mingw
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-mingw repository: pivotaldata/centos-mingw
...@@ -857,7 +857,7 @@ anchors: ...@@ -857,7 +857,7 @@ anchors:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -952,7 +952,7 @@ set_failed_anchor: &set_failed ...@@ -952,7 +952,7 @@ set_failed_anchor: &set_failed
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -979,7 +979,7 @@ set_failed_two_clusters_anchor: &set_failed_two_clusters ...@@ -979,7 +979,7 @@ set_failed_two_clusters_anchor: &set_failed_two_clusters
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -1005,7 +1005,7 @@ dpm_debug_sleep_anchor: &dpm_debug_sleep ...@@ -1005,7 +1005,7 @@ dpm_debug_sleep_anchor: &dpm_debug_sleep
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
tag: latest tag: latest
...@@ -2011,7 +2011,7 @@ jobs: ...@@ -2011,7 +2011,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2525,7 +2525,7 @@ jobs: ...@@ -2525,7 +2525,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2688,7 +2688,7 @@ jobs: ...@@ -2688,7 +2688,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -3122,7 +3122,7 @@ jobs: ...@@ -3122,7 +3122,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -3221,7 +3221,7 @@ jobs: ...@@ -3221,7 +3221,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3299,7 +3299,7 @@ jobs: ...@@ -3299,7 +3299,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3377,7 +3377,7 @@ jobs: ...@@ -3377,7 +3377,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3662,7 +3662,7 @@ jobs: ...@@ -3662,7 +3662,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3695,7 +3695,7 @@ jobs: ...@@ -3695,7 +3695,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3715,7 +3715,7 @@ jobs: ...@@ -3715,7 +3715,7 @@ jobs:
- name: ccp_src - name: ccp_src
- name: gpdb_src - name: gpdb_src
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3766,7 +3766,7 @@ jobs: ...@@ -3766,7 +3766,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3798,7 +3798,7 @@ jobs: ...@@ -3798,7 +3798,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3818,7 +3818,7 @@ jobs: ...@@ -3818,7 +3818,7 @@ jobs:
- name: ccp_src - name: ccp_src
- name: gpdb_src - name: gpdb_src
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3883,7 +3883,7 @@ jobs: ...@@ -3883,7 +3883,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -3943,7 +3943,7 @@ jobs: ...@@ -3943,7 +3943,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -4283,7 +4283,7 @@ jobs: ...@@ -4283,7 +4283,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
......
resource_types: resource_types:
- name: pull-request - name: pull-request
type: docker-image type: registry-image
source: source:
repository: teliaoss/github-pr-resource repository: teliaoss/github-pr-resource
- name: gcs - name: gcs
type: docker-image type: registry-image
source: source:
repository: frodenas/gcs-resource repository: frodenas/gcs-resource
...@@ -34,7 +34,7 @@ resources: ...@@ -34,7 +34,7 @@ resources:
uri: {{gpaddon-git-remote}} uri: {{gpaddon-git-remote}}
- name: centos-gpdb-dev-6 - name: centos-gpdb-dev-6
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-gpdb-dev repository: pivotaldata/centos-gpdb-dev
tag: '6-gcc6.2-llvm3.7' tag: '6-gcc6.2-llvm3.7'
......
...@@ -327,18 +327,18 @@ groups: ...@@ -327,18 +327,18 @@ groups:
resource_types: resource_types:
- name: terraform - name: terraform
type: docker-image type: registry-image
source: source:
repository: ljfranklin/terraform-resource repository: ljfranklin/terraform-resource
tag: 0.11.14 tag: 0.11.14
- name: pivnet - name: pivnet
type: docker-image type: registry-image
source: source:
repository: pivotalcf/pivnet-resource repository: pivotalcf/pivnet-resource
tag: latest-final tag: latest-final
{% if "ICW" in test_sections %} {% if "ICW" in test_sections %}
- name: gcs - name: gcs
type: docker-image type: registry-image
source: source:
repository: frodenas/gcs-resource repository: frodenas/gcs-resource
{% endif %} {% endif %}
...@@ -366,7 +366,7 @@ resources: ...@@ -366,7 +366,7 @@ resources:
uri: {{ccp-git-remote}} uri: {{ccp-git-remote}}
- name: ccp-image - name: ccp-image
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -475,43 +475,43 @@ resources: ...@@ -475,43 +475,43 @@ resources:
uri: ((debian-release-git-remote)) uri: ((debian-release-git-remote))
- name: centos-gpdb-dev-6 - name: centos-gpdb-dev-6
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-gpdb-dev repository: pivotaldata/centos-gpdb-dev
tag: '6-gcc6.2-llvm3.7' tag: '6-gcc6.2-llvm3.7'
- name: centos-gpdb-dev-7 - name: centos-gpdb-dev-7
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-gpdb-dev repository: pivotaldata/centos-gpdb-dev
tag: 7-gcc6.2-llvm3.7 tag: 7-gcc6.2-llvm3.7
- name: oracle-gpdb-test-7 - name: oracle-gpdb-test-7
type: docker-image type: registry-image
source: source:
repository: pivotaldata/oracle7-test repository: pivotaldata/oracle7-test
tag: gpdb5-latest tag: gpdb5-latest
- name: ubuntu-gpdb-dev-16 - name: ubuntu-gpdb-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpdb-dev repository: pivotaldata/ubuntu-gpdb-dev
tag: '16.04' tag: '16.04'
- name: ubuntu16.04-test - name: ubuntu16.04-test
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu16.04-test repository: pivotaldata/ubuntu16.04-test
tag: gpdb5-latest tag: gpdb5-latest
- name: ubuntu-gpdb-debian-dev-16 - name: ubuntu-gpdb-debian-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpdb-debian-dev repository: pivotaldata/ubuntu-gpdb-debian-dev
tag: '16.04' tag: '16.04'
- name: ubuntu-gpcloud-dev-16 - name: ubuntu-gpcloud-dev-16
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ubuntu-gpcloud-dev repository: pivotaldata/ubuntu-gpcloud-dev
tag: '16.04' tag: '16.04'
...@@ -519,7 +519,7 @@ resources: ...@@ -519,7 +519,7 @@ resources:
password: {{docker_password}} password: {{docker_password}}
- name: centos-mingw - name: centos-mingw
type: docker-image type: registry-image
source: source:
repository: pivotaldata/centos-mingw repository: pivotaldata/centos-mingw
...@@ -900,7 +900,7 @@ anchors: ...@@ -900,7 +900,7 @@ anchors:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -995,7 +995,7 @@ set_failed_anchor: &set_failed ...@@ -995,7 +995,7 @@ set_failed_anchor: &set_failed
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -1022,7 +1022,7 @@ set_failed_two_clusters_anchor: &set_failed_two_clusters ...@@ -1022,7 +1022,7 @@ set_failed_two_clusters_anchor: &set_failed_two_clusters
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -1048,7 +1048,7 @@ dpm_debug_sleep_anchor: &dpm_debug_sleep ...@@ -1048,7 +1048,7 @@ dpm_debug_sleep_anchor: &dpm_debug_sleep
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
tag: latest tag: latest
...@@ -2060,7 +2060,7 @@ jobs: ...@@ -2060,7 +2060,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2296,7 +2296,7 @@ jobs: ...@@ -2296,7 +2296,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2463,7 +2463,7 @@ jobs: ...@@ -2463,7 +2463,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2744,7 +2744,7 @@ jobs: ...@@ -2744,7 +2744,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -2844,7 +2844,7 @@ jobs: ...@@ -2844,7 +2844,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -2922,7 +2922,7 @@ jobs: ...@@ -2922,7 +2922,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3000,7 +3000,7 @@ jobs: ...@@ -3000,7 +3000,7 @@ jobs:
- name: cluster_env_files - name: cluster_env_files
- name: ddboost_rpm - name: ddboost_rpm
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3285,7 +3285,7 @@ jobs: ...@@ -3285,7 +3285,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3318,7 +3318,7 @@ jobs: ...@@ -3318,7 +3318,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3338,7 +3338,7 @@ jobs: ...@@ -3338,7 +3338,7 @@ jobs:
- name: ccp_src - name: ccp_src
- name: gpdb_src - name: gpdb_src
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3389,7 +3389,7 @@ jobs: ...@@ -3389,7 +3389,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3421,7 +3421,7 @@ jobs: ...@@ -3421,7 +3421,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: "7" tag: "7"
...@@ -3441,7 +3441,7 @@ jobs: ...@@ -3441,7 +3441,7 @@ jobs:
- name: ccp_src - name: ccp_src
- name: gpdb_src - name: gpdb_src
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: pivotaldata/ccp repository: pivotaldata/ccp
tag: '7' tag: '7'
...@@ -3509,7 +3509,7 @@ jobs: ...@@ -3509,7 +3509,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -3573,7 +3573,7 @@ jobs: ...@@ -3573,7 +3573,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
...@@ -3734,7 +3734,7 @@ jobs: ...@@ -3734,7 +3734,7 @@ jobs:
config: config:
platform: linux platform: linux
image_resource: image_resource:
type: docker-image type: registry-image
source: source:
repository: alpine repository: alpine
run: run:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册