Skip to content

Commit 654b887

Browse files
committed
Adding docker config
1 parent 749fc76 commit 654b887

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

ci/images/app-broker-ci/Dockerfile

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,5 @@ RUN curl -L "https://github.com/cloudfoundry/bosh-bootloader/releases/download/v
4040
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 && \
4141
chmod +x /usr/local/bin/bosh
4242

43-
RUN mkdir cf-cli && \
44-
wget -q -O - 'https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github' \
45-
| tar -zx --no-same-owner -C 'cf-cli' && \
46-
mv cf-cli/cf* /usr/local/bin/
43+
RUN cd /usr/local/bin && curl -L 'https://packages.cloudfoundry.org/stable?release=linux64-binary&version=v7&source=github' | tar xz && \
44+
chmod +x /usr/local/bin/cf

ci/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
input_mapping:
2828
git-repo: ci-images-git-repo
2929
vars:
30-
registry: ((app-broker-dev-docker-registry))
30+
registry: ((app-broker-virtual-docker-registry))
3131
registry-username: ((broadcom-jfrog-artifactory-robot-account.username))
3232
registry-password: ((broadcom-jfrog-artifactory-robot-account.password))
3333
- task: build-image

ci/tasks/generate-docker-credentials.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ run:
2020

2121
params:
2222
DOCKER_CONFIG_OUTPUT: ../docker-config
23-
REGISTRY: ((registry))
24-
REGISTRY_USERNAME: ((registry-username))
25-
REGISTRY_PASSWORD: ((registry-password))
23+
REGISTRY: ((app-broker-virtual-docker-registry))
24+
REGISTRY_USERNAME: ((broadcom-jfrog-artifactory-robot-account.username))
25+
REGISTRY_PASSWORD: ((broadcom-jfrog-artifactory-robot-account.password))

0 commit comments

Comments
 (0)