From 654b887d55fa663e84bc5dcc8d817ad30a1f37e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alberto=20C=2E=20R=C3=ADos?= Date: Mon, 1 Jul 2024 11:46:44 +0200 Subject: [PATCH] Adding docker config --- ci/images/app-broker-ci/Dockerfile | 6 ++---- ci/pipeline.yml | 2 +- ci/tasks/generate-docker-credentials.yml | 6 +++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/ci/images/app-broker-ci/Dockerfile b/ci/images/app-broker-ci/Dockerfile index 23799d7..27bad2f 100644 --- a/ci/images/app-broker-ci/Dockerfile +++ b/ci/images/app-broker-ci/Dockerfile @@ -40,7 +40,5 @@ RUN curl -L "https://github.com/cloudfoundry/bosh-bootloader/releases/download/v RUN curl -L "https://github.com/cloudfoundry/bosh-cli/releases/download/v$BOSH_CLI_VERSION/bosh-cli-$BOSH_CLI_VERSION-linux-amd64" --output /usr/local/bin/bosh && \ chmod +x /usr/local/bin/bosh -RUN mkdir cf-cli && \ - wget -q -O - 'https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github' \ - | tar -zx --no-same-owner -C 'cf-cli' && \ - mv cf-cli/cf* /usr/local/bin/ +RUN cd /usr/local/bin && curl -L 'https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github' | tar xz && \ + chmod +x /usr/local/bin/cf diff --git a/ci/pipeline.yml b/ci/pipeline.yml index 01cd0b7..5a74382 100644 --- a/ci/pipeline.yml +++ b/ci/pipeline.yml @@ -27,7 +27,7 @@ jobs: input_mapping: git-repo: ci-images-git-repo vars: - registry: ((app-broker-dev-docker-registry)) + registry: ((app-broker-virtual-docker-registry)) registry-username: ((broadcom-jfrog-artifactory-robot-account.username)) registry-password: ((broadcom-jfrog-artifactory-robot-account.password)) - task: build-image diff --git a/ci/tasks/generate-docker-credentials.yml b/ci/tasks/generate-docker-credentials.yml index 4094063..b854487 100644 --- a/ci/tasks/generate-docker-credentials.yml +++ b/ci/tasks/generate-docker-credentials.yml @@ -20,6 +20,6 @@ run: params: DOCKER_CONFIG_OUTPUT: ../docker-config - REGISTRY: ((registry)) - REGISTRY_USERNAME: ((registry-username)) - REGISTRY_PASSWORD: ((registry-password)) + REGISTRY: ((app-broker-virtual-docker-registry)) + REGISTRY_USERNAME: ((broadcom-jfrog-artifactory-robot-account.username)) + REGISTRY_PASSWORD: ((broadcom-jfrog-artifactory-robot-account.password))