Skip to content

Commit

Permalink
Remove garden scripts from docker-cpi docker image
Browse files Browse the repository at this point in the history
These must have been copied in here by accident at some point
  • Loading branch information
jpalermo committed Jan 22, 2025
1 parent 25806c1 commit c086e9f
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 134 deletions.
8 changes: 1 addition & 7 deletions ci/dockerfiles/docker-cpi/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ RUN docker_gpg="/etc/apt/trusted.gpg.d/docker.gpg" \
iproute2 \
xfsprogs

ADD ./install-garden.sh /tmp/install-garden.sh
RUN /tmp/install-garden.sh \
&& rm /tmp/install-garden.sh

# https://github.com/docker/cli/issues/4807
# As of 02/01/2024 a change in the "/etc/init.d/docker" script shipped with docker v25
# is preventing the cpi image to work.
Expand All @@ -37,7 +33,5 @@ RUN curl -o /usr/local/bosh.tgz "$(bosh int /usr/local/bosh-deployment/bosh.yml

COPY local-releases.yml /usr/local/local-releases.yml
COPY start-bosh.sh /usr/local/bin/start-bosh
COPY start-garden.sh /usr/local/bin/start-garden

RUN chmod +x /usr/local/bin/start-bosh \
&& chmod +x /usr/local/bin/start-garden \
RUN chmod +x /usr/local/bin/start-bosh
17 changes: 0 additions & 17 deletions ci/dockerfiles/docker-cpi/install-garden.sh

This file was deleted.

5 changes: 0 additions & 5 deletions ci/dockerfiles/docker-cpi/start-bosh.sh
Original file line number Diff line number Diff line change
Expand Up @@ -188,11 +188,6 @@ function main() {
-v docker_tls="{\"ca\": \"$(cat ${certs_dir}/ca_json_safe.pem)\",\"certificate\": \"$(cat ${certs_dir}/client_certificate_json_safe.pem)\",\"private_key\": \"$(cat ${certs_dir}/client_private_key_json_safe.pem)\"}" \
${@} > "${local_bosh_dir}/bosh-director.yml"

if [[ "${STEMCELL_OS:-"ubuntu-jammy"}" == "ubuntu-bionic" ]]; then
bosh int "${local_bosh_dir}/bosh-director.yml" -o misc/source-releases/bosh.yml -o docker/use-bionic.yml > "${local_bosh_dir}/bosh-director-bionic.yml"
mv "${local_bosh_dir}/bosh-director-bionic.yml" "${local_bosh_dir}/bosh-director.yml"
fi

command bosh create-env "${local_bosh_dir}/bosh-director.yml" \
--vars-store="${local_bosh_dir}/creds.yml" \
--state="${local_bosh_dir}/state.json"
Expand Down
105 changes: 0 additions & 105 deletions ci/dockerfiles/docker-cpi/start-garden.sh

This file was deleted.

0 comments on commit c086e9f

Please sign in to comment.