From 716ffe2a12fec6b14cd6a7731d40da7bbd586ca7 Mon Sep 17 00:00:00 2001 From: Charles Hansen Date: Mon, 13 Jan 2020 08:52:33 -0800 Subject: [PATCH 1/2] Move old-style dockerfiles to old-docker hopefully less confusing [#170088778](https://www.pivotaltracker.com/story/show/170088778) --- .../bosh-blobstore-client/Dockerfile | 0 .../bosh-blobstore-client/build-image.sh | 0 ci/{docker => old-docker}/configure.sh | 0 .../main-bats-aws/Dockerfile | 0 .../main-bosh-docker/.gitignore | 0 .../main-bosh-docker/Dockerfile | 0 .../main-bosh-docker/README.md | 0 .../create-and-upload-release.sh | 0 .../main-bosh-docker/deployment-name.yml | 0 .../main-bosh-docker/destroy-inner-bosh.sh | 0 .../inner-bosh-cloud-config.yml | 0 .../main-bosh-docker/inner-bosh-ops.yml | 0 .../main-bosh-docker/install-ruby.sh | 0 .../main-bosh-docker/install.sh | 0 .../main-bosh-docker/latest-bosh-release.yml | 0 .../main-bosh-docker/local-releases.yml | 0 .../outer-cloud-config-ops.yml | 0 .../main-bosh-docker/start-bosh.sh | 0 .../start-inner-bosh-parallel.sh | 0 .../main-bosh-docker/start-inner-bosh.sh | 0 .../main-bosh-garden/Dockerfile | 0 .../main-bosh-garden/README.md | 0 .../main-bosh-garden/install-garden.sh | 0 .../main-bosh-garden/start-bosh.sh | 0 .../main-bosh-garden/start-garden.sh | 0 .../main-mysql/Dockerfile | 0 .../main-mysql/install-java.sh | 0 .../main-mysql/install-ruby.sh | 0 .../main-postgres/Dockerfile | 0 .../main-postgres/install-java.sh | 0 .../main-postgres/install-ruby.sh | 0 .../main-postgres/trust_pg_hba.conf | 0 .../main-ruby-go/Dockerfile | 0 .../main-ruby-go/install-ruby.sh | 0 .../main-ubuntu-chroot/Dockerfile | 0 ci/{docker => old-docker}/main/Dockerfile | 0 ci/{docker => old-docker}/main/install-java.sh | 0 ci/{docker => old-docker}/pipeline.yml | 18 +++++++++--------- ...pare-container-bosh-docker-build-context.sh | 2 +- ci/tasks/test-bdrats.sh | 2 +- ci/tasks/test-brats.sh | 4 ++-- 41 files changed, 13 insertions(+), 13 deletions(-) rename ci/{docker => old-docker}/bosh-blobstore-client/Dockerfile (100%) rename ci/{docker => old-docker}/bosh-blobstore-client/build-image.sh (100%) rename ci/{docker => old-docker}/configure.sh (100%) rename ci/{docker => old-docker}/main-bats-aws/Dockerfile (100%) rename ci/{docker => old-docker}/main-bosh-docker/.gitignore (100%) rename ci/{docker => old-docker}/main-bosh-docker/Dockerfile (100%) rename ci/{docker => old-docker}/main-bosh-docker/README.md (100%) rename ci/{docker => old-docker}/main-bosh-docker/create-and-upload-release.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/deployment-name.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/destroy-inner-bosh.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/inner-bosh-cloud-config.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/inner-bosh-ops.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/install-ruby.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/install.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/latest-bosh-release.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/local-releases.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/outer-cloud-config-ops.yml (100%) rename ci/{docker => old-docker}/main-bosh-docker/start-bosh.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/start-inner-bosh-parallel.sh (100%) rename ci/{docker => old-docker}/main-bosh-docker/start-inner-bosh.sh (100%) rename ci/{docker => old-docker}/main-bosh-garden/Dockerfile (100%) rename ci/{docker => old-docker}/main-bosh-garden/README.md (100%) rename ci/{docker => old-docker}/main-bosh-garden/install-garden.sh (100%) rename ci/{docker => old-docker}/main-bosh-garden/start-bosh.sh (100%) rename ci/{docker => old-docker}/main-bosh-garden/start-garden.sh (100%) rename ci/{docker => old-docker}/main-mysql/Dockerfile (100%) rename ci/{docker => old-docker}/main-mysql/install-java.sh (100%) rename ci/{docker => old-docker}/main-mysql/install-ruby.sh (100%) rename ci/{docker => old-docker}/main-postgres/Dockerfile (100%) rename ci/{docker => old-docker}/main-postgres/install-java.sh (100%) rename ci/{docker => old-docker}/main-postgres/install-ruby.sh (100%) rename ci/{docker => old-docker}/main-postgres/trust_pg_hba.conf (100%) rename ci/{docker => old-docker}/main-ruby-go/Dockerfile (100%) rename ci/{docker => old-docker}/main-ruby-go/install-ruby.sh (100%) rename ci/{docker => old-docker}/main-ubuntu-chroot/Dockerfile (100%) rename ci/{docker => old-docker}/main/Dockerfile (100%) rename ci/{docker => old-docker}/main/install-java.sh (100%) rename ci/{docker => old-docker}/pipeline.yml (95%) diff --git a/ci/docker/bosh-blobstore-client/Dockerfile b/ci/old-docker/bosh-blobstore-client/Dockerfile similarity index 100% rename from ci/docker/bosh-blobstore-client/Dockerfile rename to ci/old-docker/bosh-blobstore-client/Dockerfile diff --git a/ci/docker/bosh-blobstore-client/build-image.sh b/ci/old-docker/bosh-blobstore-client/build-image.sh similarity index 100% rename from ci/docker/bosh-blobstore-client/build-image.sh rename to ci/old-docker/bosh-blobstore-client/build-image.sh diff --git a/ci/docker/configure.sh b/ci/old-docker/configure.sh similarity index 100% rename from ci/docker/configure.sh rename to ci/old-docker/configure.sh diff --git a/ci/docker/main-bats-aws/Dockerfile b/ci/old-docker/main-bats-aws/Dockerfile similarity index 100% rename from ci/docker/main-bats-aws/Dockerfile rename to ci/old-docker/main-bats-aws/Dockerfile diff --git a/ci/docker/main-bosh-docker/.gitignore b/ci/old-docker/main-bosh-docker/.gitignore similarity index 100% rename from ci/docker/main-bosh-docker/.gitignore rename to ci/old-docker/main-bosh-docker/.gitignore diff --git a/ci/docker/main-bosh-docker/Dockerfile b/ci/old-docker/main-bosh-docker/Dockerfile similarity index 100% rename from ci/docker/main-bosh-docker/Dockerfile rename to ci/old-docker/main-bosh-docker/Dockerfile diff --git a/ci/docker/main-bosh-docker/README.md b/ci/old-docker/main-bosh-docker/README.md similarity index 100% rename from ci/docker/main-bosh-docker/README.md rename to ci/old-docker/main-bosh-docker/README.md diff --git a/ci/docker/main-bosh-docker/create-and-upload-release.sh b/ci/old-docker/main-bosh-docker/create-and-upload-release.sh similarity index 100% rename from ci/docker/main-bosh-docker/create-and-upload-release.sh rename to ci/old-docker/main-bosh-docker/create-and-upload-release.sh diff --git a/ci/docker/main-bosh-docker/deployment-name.yml b/ci/old-docker/main-bosh-docker/deployment-name.yml similarity index 100% rename from ci/docker/main-bosh-docker/deployment-name.yml rename to ci/old-docker/main-bosh-docker/deployment-name.yml diff --git a/ci/docker/main-bosh-docker/destroy-inner-bosh.sh b/ci/old-docker/main-bosh-docker/destroy-inner-bosh.sh similarity index 100% rename from ci/docker/main-bosh-docker/destroy-inner-bosh.sh rename to ci/old-docker/main-bosh-docker/destroy-inner-bosh.sh diff --git a/ci/docker/main-bosh-docker/inner-bosh-cloud-config.yml b/ci/old-docker/main-bosh-docker/inner-bosh-cloud-config.yml similarity index 100% rename from ci/docker/main-bosh-docker/inner-bosh-cloud-config.yml rename to ci/old-docker/main-bosh-docker/inner-bosh-cloud-config.yml diff --git a/ci/docker/main-bosh-docker/inner-bosh-ops.yml b/ci/old-docker/main-bosh-docker/inner-bosh-ops.yml similarity index 100% rename from ci/docker/main-bosh-docker/inner-bosh-ops.yml rename to ci/old-docker/main-bosh-docker/inner-bosh-ops.yml diff --git a/ci/docker/main-bosh-docker/install-ruby.sh b/ci/old-docker/main-bosh-docker/install-ruby.sh similarity index 100% rename from ci/docker/main-bosh-docker/install-ruby.sh rename to ci/old-docker/main-bosh-docker/install-ruby.sh diff --git a/ci/docker/main-bosh-docker/install.sh b/ci/old-docker/main-bosh-docker/install.sh similarity index 100% rename from ci/docker/main-bosh-docker/install.sh rename to ci/old-docker/main-bosh-docker/install.sh diff --git a/ci/docker/main-bosh-docker/latest-bosh-release.yml b/ci/old-docker/main-bosh-docker/latest-bosh-release.yml similarity index 100% rename from ci/docker/main-bosh-docker/latest-bosh-release.yml rename to ci/old-docker/main-bosh-docker/latest-bosh-release.yml diff --git a/ci/docker/main-bosh-docker/local-releases.yml b/ci/old-docker/main-bosh-docker/local-releases.yml similarity index 100% rename from ci/docker/main-bosh-docker/local-releases.yml rename to ci/old-docker/main-bosh-docker/local-releases.yml diff --git a/ci/docker/main-bosh-docker/outer-cloud-config-ops.yml b/ci/old-docker/main-bosh-docker/outer-cloud-config-ops.yml similarity index 100% rename from ci/docker/main-bosh-docker/outer-cloud-config-ops.yml rename to ci/old-docker/main-bosh-docker/outer-cloud-config-ops.yml diff --git a/ci/docker/main-bosh-docker/start-bosh.sh b/ci/old-docker/main-bosh-docker/start-bosh.sh similarity index 100% rename from ci/docker/main-bosh-docker/start-bosh.sh rename to ci/old-docker/main-bosh-docker/start-bosh.sh diff --git a/ci/docker/main-bosh-docker/start-inner-bosh-parallel.sh b/ci/old-docker/main-bosh-docker/start-inner-bosh-parallel.sh similarity index 100% rename from ci/docker/main-bosh-docker/start-inner-bosh-parallel.sh rename to ci/old-docker/main-bosh-docker/start-inner-bosh-parallel.sh diff --git a/ci/docker/main-bosh-docker/start-inner-bosh.sh b/ci/old-docker/main-bosh-docker/start-inner-bosh.sh similarity index 100% rename from ci/docker/main-bosh-docker/start-inner-bosh.sh rename to ci/old-docker/main-bosh-docker/start-inner-bosh.sh diff --git a/ci/docker/main-bosh-garden/Dockerfile b/ci/old-docker/main-bosh-garden/Dockerfile similarity index 100% rename from ci/docker/main-bosh-garden/Dockerfile rename to ci/old-docker/main-bosh-garden/Dockerfile diff --git a/ci/docker/main-bosh-garden/README.md b/ci/old-docker/main-bosh-garden/README.md similarity index 100% rename from ci/docker/main-bosh-garden/README.md rename to ci/old-docker/main-bosh-garden/README.md diff --git a/ci/docker/main-bosh-garden/install-garden.sh b/ci/old-docker/main-bosh-garden/install-garden.sh similarity index 100% rename from ci/docker/main-bosh-garden/install-garden.sh rename to ci/old-docker/main-bosh-garden/install-garden.sh diff --git a/ci/docker/main-bosh-garden/start-bosh.sh b/ci/old-docker/main-bosh-garden/start-bosh.sh similarity index 100% rename from ci/docker/main-bosh-garden/start-bosh.sh rename to ci/old-docker/main-bosh-garden/start-bosh.sh diff --git a/ci/docker/main-bosh-garden/start-garden.sh b/ci/old-docker/main-bosh-garden/start-garden.sh similarity index 100% rename from ci/docker/main-bosh-garden/start-garden.sh rename to ci/old-docker/main-bosh-garden/start-garden.sh diff --git a/ci/docker/main-mysql/Dockerfile b/ci/old-docker/main-mysql/Dockerfile similarity index 100% rename from ci/docker/main-mysql/Dockerfile rename to ci/old-docker/main-mysql/Dockerfile diff --git a/ci/docker/main-mysql/install-java.sh b/ci/old-docker/main-mysql/install-java.sh similarity index 100% rename from ci/docker/main-mysql/install-java.sh rename to ci/old-docker/main-mysql/install-java.sh diff --git a/ci/docker/main-mysql/install-ruby.sh b/ci/old-docker/main-mysql/install-ruby.sh similarity index 100% rename from ci/docker/main-mysql/install-ruby.sh rename to ci/old-docker/main-mysql/install-ruby.sh diff --git a/ci/docker/main-postgres/Dockerfile b/ci/old-docker/main-postgres/Dockerfile similarity index 100% rename from ci/docker/main-postgres/Dockerfile rename to ci/old-docker/main-postgres/Dockerfile diff --git a/ci/docker/main-postgres/install-java.sh b/ci/old-docker/main-postgres/install-java.sh similarity index 100% rename from ci/docker/main-postgres/install-java.sh rename to ci/old-docker/main-postgres/install-java.sh diff --git a/ci/docker/main-postgres/install-ruby.sh b/ci/old-docker/main-postgres/install-ruby.sh similarity index 100% rename from ci/docker/main-postgres/install-ruby.sh rename to ci/old-docker/main-postgres/install-ruby.sh diff --git a/ci/docker/main-postgres/trust_pg_hba.conf b/ci/old-docker/main-postgres/trust_pg_hba.conf similarity index 100% rename from ci/docker/main-postgres/trust_pg_hba.conf rename to ci/old-docker/main-postgres/trust_pg_hba.conf diff --git a/ci/docker/main-ruby-go/Dockerfile b/ci/old-docker/main-ruby-go/Dockerfile similarity index 100% rename from ci/docker/main-ruby-go/Dockerfile rename to ci/old-docker/main-ruby-go/Dockerfile diff --git a/ci/docker/main-ruby-go/install-ruby.sh b/ci/old-docker/main-ruby-go/install-ruby.sh similarity index 100% rename from ci/docker/main-ruby-go/install-ruby.sh rename to ci/old-docker/main-ruby-go/install-ruby.sh diff --git a/ci/docker/main-ubuntu-chroot/Dockerfile b/ci/old-docker/main-ubuntu-chroot/Dockerfile similarity index 100% rename from ci/docker/main-ubuntu-chroot/Dockerfile rename to ci/old-docker/main-ubuntu-chroot/Dockerfile diff --git a/ci/docker/main/Dockerfile b/ci/old-docker/main/Dockerfile similarity index 100% rename from ci/docker/main/Dockerfile rename to ci/old-docker/main/Dockerfile diff --git a/ci/docker/main/install-java.sh b/ci/old-docker/main/install-java.sh similarity index 100% rename from ci/docker/main/install-java.sh rename to ci/old-docker/main/install-java.sh diff --git a/ci/docker/pipeline.yml b/ci/old-docker/pipeline.yml similarity index 95% rename from ci/docker/pipeline.yml rename to ci/old-docker/pipeline.yml index d2b76339039..2febf2d07bc 100644 --- a/ci/docker/pipeline.yml +++ b/ci/old-docker/pipeline.yml @@ -25,7 +25,7 @@ jobs: trigger: true - put: main-postgres-9.4 params: - build: "bosh-src/ci/docker/main-postgres" + build: "bosh-src/ci/old-docker/main-postgres" build_args: DB_VERSION: "9.4" get_params: @@ -39,7 +39,7 @@ jobs: trigger: true - put: main-postgres-10 params: - build: "bosh-src/ci/docker/main-postgres" + build: "bosh-src/ci/old-docker/main-postgres" build_args: DB_VERSION: "10" get_params: @@ -53,7 +53,7 @@ jobs: trigger: true - put: main-mysql-5.7 params: - build: "bosh-src/ci/docker/main-mysql" + build: "bosh-src/ci/old-docker/main-mysql" build_args: DB_VERSION: "-5.7" get_params: @@ -69,7 +69,7 @@ jobs: - "build-main-ruby-go" - put: main-image params: - build: "bosh-src/ci/docker/main" + build: "bosh-src/ci/old-docker/main" get_params: skip_download: true @@ -204,7 +204,7 @@ jobs: - "build-main-ruby-go" - put: main-ubuntu-chroot params: - build: "bosh-src/ci/docker/main-ubuntu-chroot" + build: "bosh-src/ci/old-docker/main-ubuntu-chroot" get_params: skip_download: true @@ -216,7 +216,7 @@ jobs: trigger: true - put: main-ruby-go-image params: - build: "bosh-src/ci/docker/main-ruby-go" + build: "bosh-src/ci/old-docker/main-ruby-go" get_params: skip_download: true @@ -230,7 +230,7 @@ jobs: - "build-main-ruby-go" - put: main-bats-aws params: - build: "bosh-src/ci/docker/main-bats-aws" + build: "bosh-src/ci/old-docker/main-bats-aws" get_params: skip_download: true @@ -242,7 +242,7 @@ jobs: trigger: true - put: bosh-blobstore-client params: - build: "bosh-src/ci/docker/bosh-blobstore-client" + build: "bosh-src/ci/old-docker/bosh-blobstore-client" get_params: skip_download: true @@ -265,7 +265,7 @@ resources: uri: https://github.com/cloudfoundry/bosh.git branch: master paths: - - "ci/docker" + - "ci/old-docker" - "ci/pipelines/docker-images/tasks" - name: bosh-linux-stemcell-builder diff --git a/ci/tasks/prepare-container-bosh-docker-build-context.sh b/ci/tasks/prepare-container-bosh-docker-build-context.sh index 41f6d4a7d1f..59864a97c10 100755 --- a/ci/tasks/prepare-container-bosh-docker-build-context.sh +++ b/ci/tasks/prepare-container-bosh-docker-build-context.sh @@ -1,6 +1,6 @@ #!/bin/bash -cp -rp bosh-src/ci/docker/main-bosh-${container_engine}/* docker-build-context +cp -rp bosh-src/ci/old-docker/main-bosh-${container_engine}/* docker-build-context cp bosh-cli/*bosh* docker-build-context/bosh diff --git a/ci/tasks/test-bdrats.sh b/ci/tasks/test-bdrats.sh index 8fa2eceb4e5..1feb4f38333 100755 --- a/ci/tasks/test-bdrats.sh +++ b/ci/tasks/test-bdrats.sh @@ -17,7 +17,7 @@ if [[ -e ${OVERRIDDEN_BOSH_DEPLOYMENT}/bosh.yml ]];then export BOSH_DEPLOYMENT_PATH=${OVERRIDDEN_BOSH_DEPLOYMENT} fi -${src_dir}/bosh-src/ci/docker/main-bosh-docker/start-bosh.sh \ +${src_dir}/bosh-src/ci/dockerfiles/docker-cpi/start-bosh.sh \ -o bbr.yml \ -o uaa.yml \ -o credhub.yml \ diff --git a/ci/tasks/test-brats.sh b/ci/tasks/test-brats.sh index 90a33495c43..5c7b0e122dc 100755 --- a/ci/tasks/test-brats.sh +++ b/ci/tasks/test-brats.sh @@ -16,7 +16,7 @@ set +e source /tmp/local-bosh/director/env set -e if ! bosh env; then - "${src_dir}/bosh-src/ci/docker/main-bosh-docker/start-bosh.sh" + "${src_dir}/bosh-src/ci/dockerfiles/docker-cpi/start-bosh.sh" fi source /tmp/local-bosh/director/env @@ -45,7 +45,7 @@ export DOCKER_HOST bosh -n update-cloud-config \ "${BOSH_DEPLOYMENT_PATH}/docker/cloud-config.yml" \ - -o "${src_dir}/bosh-src/ci/docker/main-bosh-docker/outer-cloud-config-ops.yml" \ + -o "${src_dir}/bosh-src/ci/dockerfiles/docker-cpi/outer-cloud-config-ops.yml" \ -v network=director_network bosh -n upload-stemcell $CANDIDATE_STEMCELL_TARBALL_PATH From 044ef15624b4c7494a7413b92565ed416e5a2688 Mon Sep 17 00:00:00 2001 From: Charles Hansen Date: Tue, 14 Jan 2020 12:33:09 -0800 Subject: [PATCH 2/2] Fix references to docker scripts in brats The scripts were just moved as part of the dockerfile refactor --- .../bosh-release-acceptance-tests/brats-utils/utils.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/go/src/github.com/cloudfoundry/bosh-release-acceptance-tests/brats-utils/utils.go b/src/go/src/github.com/cloudfoundry/bosh-release-acceptance-tests/brats-utils/utils.go index 3352906d0d6..21c0243893d 100644 --- a/src/go/src/github.com/cloudfoundry/bosh-release-acceptance-tests/brats-utils/utils.go +++ b/src/go/src/github.com/cloudfoundry/bosh-release-acceptance-tests/brats-utils/utils.go @@ -348,7 +348,7 @@ func StartInnerBoshWithExpectation(expectedFailure bool, expectedErrorToMatch st } cmd := exec.Command( - fmt.Sprintf("../../../../../../../ci/docker/main-bosh-docker/start-inner-bosh-parallel.sh"), + fmt.Sprintf("../../../../../../../ci/dockerfiles/docker-cpi/start-inner-bosh-parallel.sh"), effectiveArgs..., ) cmd.Env = os.Environ() @@ -366,7 +366,7 @@ func StartInnerBoshWithExpectation(expectedFailure bool, expectedErrorToMatch st func CreateAndUploadBOSHRelease() { cmd := exec.Command( - fmt.Sprintf("../../../../../../../ci/docker/main-bosh-docker/create-and-upload-release.sh"), + fmt.Sprintf("../../../../../../../ci/dockerfiles/docker-cpi/create-and-upload-release.sh"), strconv.Itoa(config.GinkgoConfig.ParallelNode), ) cmd.Env = os.Environ() @@ -380,7 +380,7 @@ func CreateAndUploadBOSHRelease() { func StopInnerBosh() { session, err := gexec.Start( exec.Command( - "../../../../../../../ci/docker/main-bosh-docker/destroy-inner-bosh.sh", + "../../../../../../../ci/dockerfiles/docker-cpidestroy-inner-bosh.sh", strconv.Itoa(config.GinkgoConfig.ParallelNode), ), GinkgoWriter,