Attempt to fix oci-build-task config

See gh-24197
This commit is contained in:
Phillip Webb 2020-12-10 15:58:19 -08:00
parent 6990fff27a
commit 615d054dec
3 changed files with 6 additions and 3 deletions

View File

@ -12,3 +12,4 @@ concourse-url: "https://ci.spring.io"
bintray-subject: "spring" bintray-subject: "spring"
bintray-repo: "jars" bintray-repo: "jars"
task-timeout: 2h00m task-timeout: 2h00m

View File

@ -209,20 +209,21 @@ jobs:
plan: plan:
- get: ci-images-git-repo - get: ci-images-git-repo
trigger: true trigger: true
- get: git-repo
- in_parallel: - in_parallel:
- task: build-ci-image - task: build-ci-image
privileged: true privileged: true
file: ci-images-git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
vars: vars:
ci-image-name: ci-image ci-image-name: ci-image
- task: build-ci-image-jdk11 - task: build-ci-image-jdk11
privileged: true privileged: true
file: ci-images-git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
vars: vars:
ci-image-name: ci-image-jdk11 ci-image-name: ci-image-jdk11
- task: build-ci-image-jdk15 - task: build-ci-image-jdk15
privileged: true privileged: true
file: ci-images-git-repo/ci/tasks/build-ci-image.yml file: git-repo/ci/tasks/build-ci-image.yml
vars: vars:
ci-image-name: ci-image-jdk15 ci-image-name: ci-image-jdk15
- in_parallel: - in_parallel:

View File

@ -13,5 +13,6 @@ caches:
params: params:
CONTEXT: ci-images-git-repo/ci/images CONTEXT: ci-images-git-repo/ci/images
DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile DOCKERFILE: ci-images-git-repo/ci/images/((ci-image-name))/Dockerfile
REGISTRY_MIRRORS: ((dockerhub-registry-mirror))
run: run:
path: build path: build