Skip to content

Commit

Permalink
Migrate to new image repositories
Browse files Browse the repository at this point in the history
  • Loading branch information
spikymonkey authored and royclarkson committed May 14, 2024
1 parent b2a2c96 commit bb3098a
Show file tree
Hide file tree
Showing 11 changed files with 75 additions and 349 deletions.
5 changes: 0 additions & 5 deletions ci/config-concourse.yml

This file was deleted.

282 changes: 0 additions & 282 deletions ci/pipeline.yml

This file was deleted.

13 changes: 13 additions & 0 deletions ci/scripts/generate-docker-credentials.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/bin/sh

set -eu

export TERM="xterm-256color"

readonly DOCKER_CONFIG_OUTPUT="${DOCKER_CONFIG_OUTPUT:?must be set}"

# Note that we don't use libs.sh here because that script requires bash, and
# we don't have bash in this container image

printf "%s" "$REGISTRY_PASSWORD" | docker login "$REGISTRY" --username "$REGISTRY_USERNAME" --password-stdin
cp -v ~/.docker/config.json "$DOCKER_CONFIG_OUTPUT/"
19 changes: 0 additions & 19 deletions ci/tasks/build-image.yml

This file was deleted.

25 changes: 25 additions & 0 deletions ci/tasks/build-oci-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
platform: linux

image_resource:
type: registry-image
source:
repository: ((open-service-broker-virtual-docker-registry))/concourse/oci-build-task
tag: 0.11.1
username: ((broadcom-jfrog-artifactory-robot-account.username))
password: ((broadcom-jfrog-artifactory-robot-account.password))

inputs:
- name: git-repo
- name: docker-config

outputs:
- name: image

run:
path: build

params:
CONTEXT:
DEBUG: true
DOCKER_CONFIG: docker-config
6 changes: 3 additions & 3 deletions ci/tasks/build-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ platform: linux
image_resource:
type: registry-image
source:
repository: ((corporate-harbor-registry))/((dockerhub-organization))/scosb-ci
username: ((corporate-harbor-robot-account.username))
password: ((corporate-harbor-robot-account.password))
repository: ((open-service-broker-dev-docker-registry))/ci/scosb-ci
username: ((broadcom-jfrog-artifactory-robot-account.username))
password: ((broadcom-jfrog-artifactory-robot-account.password))
tag: ((ci-image-tag))
inputs:
- name: git-repo
Expand Down
25 changes: 25 additions & 0 deletions ci/tasks/generate-docker-credentials.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
platform: linux

image_resource:
type: registry-image
source:
repository: ((open-service-broker-virtual-docker-registry))/docker
tag: 26-cli
username: ((broadcom-jfrog-artifactory-robot-account.username))
password: ((broadcom-jfrog-artifactory-robot-account.password))

inputs:
- name: git-repo

outputs:
- name: docker-config

run:
path: ci/scripts/generate-docker-credentials.sh
dir: git-repo

params:
DOCKER_CONFIG_OUTPUT: ../docker-config
REGISTRY: ((registry))
REGISTRY_USERNAME: ((registry-username))
REGISTRY_PASSWORD: ((registry-password))
4 changes: 3 additions & 1 deletion ci/tasks/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@ platform: linux
image_resource:
type: registry-image
source:
repository: ((dockerhub-mirror-registry))/springio/concourse-release-scripts
repository: ((open-service-broker-virtual-docker-registry))/springio/concourse-release-scripts
username: ((broadcom-jfrog-artifactory-robot-account.username))
password: ((broadcom-jfrog-artifactory-robot-account.password))
tag: '0.3.4'
inputs:
- name: git-repo
Expand Down
Loading

0 comments on commit bb3098a

Please sign in to comment.