Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ci/ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -473,6 +473,7 @@ jobs:
params:
DOCKERFILE: docs-platform-automation/ci/dockerfiles/Dockerfile.ci
IMAGE_ARG_base_image: base-image/image.tar
IMAGE_ARG_concourse_url: ((platform-automation/main/fly.newtarget))
- put: ci-image
params: { image: image/image.tar }
get_params: { skip_download: true }
Expand Down Expand Up @@ -1454,7 +1455,7 @@ jobs:
params:
FLY_USERNAME: ((platform-automation/main/fly.username))
FLY_PASSWORD: ((platform-automation/main/fly.password))
FLY_TARGET: ((platform-automation/main/fly.target))
FLY_TARGET: ((platform-automation/main/fly.newtarget))
SECRET_ALLOWLIST: ((platform-automation/main/ci.secret-allowlist))
- name: additional-task-testing
serial: true
Expand Down
4 changes: 3 additions & 1 deletion ci/dockerfiles/Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
ARG base_image
FROM ${base_image}

ARG concourse_url

RUN apt-get -y update && apt-get -y install rsync build-essential bash zip unzip curl gettext jq git wget tar xz-utils

RUN wget "https://github.com/koalaman/shellcheck/releases/download/stable/shellcheck-stable.linux.x86_64.tar.xz" && \
Expand Down Expand Up @@ -30,7 +32,7 @@ RUN chmod +x ./credhub && \
mv ./credhub /usr/bin/credhub

# install fly
RUN wget "https://platform-automation.ci.cf-app.com/api/v1/cli?arch=amd64&platform=linux" -O fly
RUN wget "${concourse_url}api/v1/cli?arch=amd64&platform=linux" -O fly
RUN chmod +x ./fly && \
mv ./fly /usr/bin/fly

Expand Down
1 change: 1 addition & 0 deletions ci/tasks/build-oci-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ outputs:
params:
DOCKERFILE:
IMAGE_ARG_base_image:
IMAGE_ARG_concourse_url:
run:
path: build