Skip to content

Commit

Permalink
cleanup: inline build-args
Browse files Browse the repository at this point in the history
  • Loading branch information
ccwienk committed Nov 12, 2024
1 parent 95dd4d7 commit 027724c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 9 deletions.
9 changes: 0 additions & 9 deletions .ci/pipeline_definitions
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,6 @@ concourse:
concourse-worker:
dockerfile: concourse-worker.dockerfile
prebuild_hook: 'prebuild-registry-resource.sh'
build_args:
# see https://github.com/robinhuiser/concourse-arm64/tree/main/build-specs
cni_plugins_version: '0.8.7'
# https://github.com/concourse/concourse-docker
concourse_docker_entrypoint_commit_id: '67aa108afb37eef509994f9d67c2f301f9438de4'
golang_concourse_builder_image: 'golang:alpine'
resource_labels:
- name: 'gardener.cloud/cve-categorisation'
value:
Expand All @@ -38,9 +32,6 @@ concourse:
dockerfile: concourse-web.dockerfile
platforms:
- linux/amd64
build_args:
# see https://github.com/robinhuiser/concourse-arm64/tree/main/build-specs
concourse_docker_entrypoint_commit_id: '67aa108afb37eef509994f9d67c2f301f9438de4'
resource_labels:
- name: 'gardener.cloud/cve-categorisation'
value:
Expand Down
1 change: 1 addition & 0 deletions concourse-web.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ RUN CGO_CFLAGS="-D_LARGEFILE64_SOURCE" \
FROM debian:bookworm-slim

ARG concourse_version=7.11.2
# see https://github.com/robinhuiser/concourse-arm64/tree/main/build-specs
ARG concourse_docker_entrypoint_commit_id=ced6f3117d93121323098d094cf7ccc1776df521

COPY --from=yarn-builder /yarn/concourse/web/public/ /public
Expand Down
1 change: 1 addition & 0 deletions concourse-worker.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ RUN ./build_linux.sh
FROM debian:bookworm-slim

ARG concourse_version=7.11.2
# https://github.com/concourse/concourse-docker
ARG concourse_docker_entrypoint_commit_id=ced6f3117d93121323098d094cf7ccc1776df521

COPY --from=go-builder /go/concourse/concourse /usr/local/concourse/bin/
Expand Down

0 comments on commit 027724c

Please sign in to comment.