diff --git a/CHANGELOG.md b/CHANGELOG.md index fda598e..1be561e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,7 @@ ## Unreleased +- Migrate from the `lang-python` S3 bucket to `heroku-buildpack-python` (#1089). - Remove `vendor/shunit2` (#1086). - Replace `BUILDPACK_VENDOR_URL` and `USE_STAGING_BINARIES` with `BUILDPACK_S3_BASE_URL` (#1085). diff --git a/bin/compile b/bin/compile index 11422f6..8c356d7 100755 --- a/bin/compile +++ b/bin/compile @@ -41,7 +41,12 @@ export BUILD_DIR CACHE_DIR ENV_DIR # The user can provide BUILDPACK_S3_BASE_URL to specify a custom target. # Note: this is designed for non-Heroku use, as it does not use the user-provided # environment variable mechanism (the ENV_DIR). -DEFAULT_S3_BASE_URL='https://lang-python.s3.amazonaws.com' +if [[ "${STACK}" == "cedar-14" ]]; then + # Since Cedar-14 is EOL on 2020-11-02 it's not worth migrating it to the new bucket. + DEFAULT_S3_BASE_URL='https://lang-python.s3.amazonaws.com' +else + DEFAULT_S3_BASE_URL='https://heroku-buildpack-python.s3.amazonaws.com' +fi S3_BASE_URL="${BUILDPACK_S3_BASE_URL:-${DEFAULT_S3_BASE_URL}}" # This has to be exported since it's used by the geo-libs step which is run in a subshell. # TODO: Stop exporting once the geo-libs step is removed or no longer uses `sub_env`. diff --git a/builds/heroku-16.Dockerfile b/builds/heroku-16.Dockerfile index c9b2bdf..cd19b57 100644 --- a/builds/heroku-16.Dockerfile +++ b/builds/heroku-16.Dockerfile @@ -1,7 +1,7 @@ FROM heroku/heroku:16-build ENV WORKSPACE_DIR="/app/builds" \ - S3_BUCKET="lang-python" \ + S3_BUCKET="heroku-buildpack-python" \ S3_PREFIX="heroku-16/" \ STACK="heroku-16" diff --git a/builds/heroku-18.Dockerfile b/builds/heroku-18.Dockerfile index edcc11d..ab992b0 100644 --- a/builds/heroku-18.Dockerfile +++ b/builds/heroku-18.Dockerfile @@ -1,7 +1,7 @@ FROM heroku/heroku:18-build ENV WORKSPACE_DIR="/app/builds" \ - S3_BUCKET="lang-python" \ + S3_BUCKET="heroku-buildpack-python" \ S3_PREFIX="heroku-18/" \ STACK="heroku-18"