From be37415950204aab9c99989545496de7ac3a1639 Mon Sep 17 00:00:00 2001 From: "heroku-linguist[bot]" <136119646+heroku-linguist[bot]@users.noreply.github.com> Date: Wed, 28 Feb 2024 08:08:39 +0000 Subject: [PATCH 1/2] Update heroku/procfile-cnb to v3.0.0 ## heroku/procfile ### Added - Enabled tracing/telemetry via `libcnb`'s `trace` feature. ([#208](https://github.com/heroku/procfile-cnb/pull/208)) ### Changed - Updated to Buildpack API 0.10. ([#205](https://github.com/heroku/procfile-cnb/pull/205)) - All launch processes are now wrapped in `bash -c` instead of using CNB's `direct = false` directive, which is no longer available. - `.profile` and `.profile.d` scripts will no longer be automatically sourced. - CNB Lifecycle 0.17 or newer is now required. --- builder-20/builder.toml | 16 ++++++++-------- builder-22/builder.toml | 16 ++++++++-------- builder-classic-22/builder.toml | 20 ++++++++++---------- buildpacks-20/builder.toml | 16 ++++++++-------- 4 files changed, 34 insertions(+), 34 deletions(-) diff --git a/builder-20/builder.toml b/builder-20/builder.toml index 19655565..077a1868 100644 --- a/builder-20/builder.toml +++ b/builder-20/builder.toml @@ -26,7 +26,7 @@ version = "0.18.5" [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" [[buildpacks]] id = "heroku/python" @@ -46,7 +46,7 @@ version = "0.18.5" version = "0.8.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -67,7 +67,7 @@ version = "0.18.5" version = "2.1.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -76,7 +76,7 @@ version = "0.18.5" version = "2.6.6" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -85,7 +85,7 @@ version = "0.18.5" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -94,7 +94,7 @@ version = "0.18.5" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -103,7 +103,7 @@ version = "0.18.5" version = "0.1.16" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -112,5 +112,5 @@ version = "0.18.5" version = "0.1.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true diff --git a/builder-22/builder.toml b/builder-22/builder.toml index cf59e375..18be4156 100644 --- a/builder-22/builder.toml +++ b/builder-22/builder.toml @@ -26,7 +26,7 @@ version = "0.18.5" [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" [[buildpacks]] id = "heroku/python" @@ -46,7 +46,7 @@ version = "0.18.5" version = "0.8.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -67,7 +67,7 @@ version = "0.18.5" version = "2.1.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -76,7 +76,7 @@ version = "0.18.5" version = "2.6.6" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -85,7 +85,7 @@ version = "0.18.5" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -94,7 +94,7 @@ version = "0.18.5" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -103,7 +103,7 @@ version = "0.18.5" version = "0.1.16" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order]] @@ -112,5 +112,5 @@ version = "0.18.5" version = "0.1.2" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true diff --git a/builder-classic-22/builder.toml b/builder-classic-22/builder.toml index 95ec6118..98759bfc 100644 --- a/builder-classic-22/builder.toml +++ b/builder-classic-22/builder.toml @@ -41,7 +41,7 @@ version = "0.17.4" [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" [[buildpacks]] id = "heroku/python" @@ -61,7 +61,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -73,7 +73,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -85,7 +85,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -97,7 +97,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -109,7 +109,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -121,7 +121,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -133,7 +133,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -145,7 +145,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -157,7 +157,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml index 2a11a65e..1213ee23 100644 --- a/buildpacks-20/builder.toml +++ b/buildpacks-20/builder.toml @@ -37,7 +37,7 @@ version = "0.17.4" [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" [[buildpacks]] id = "heroku/python" @@ -57,7 +57,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -69,7 +69,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -81,7 +81,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -93,7 +93,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -105,7 +105,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -117,7 +117,7 @@ version = "0.17.4" version = "2.6.6" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -129,7 +129,7 @@ version = "0.17.4" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "2.0.2" + version = "3.0.0" optional = true [[order.group]] id = "heroku/builder-eol-warning" From 4ae7983b0dd18616c786b1e270180b67ea53ef80 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Wed, 28 Feb 2024 09:30:32 +0000 Subject: [PATCH 2/2] Downgrade procfile to v2.0.2 in legacy builder images We have to use Procfile CNB v2.0.2 in this builder image, since cnb-shim isn't compatible with the direct process mode used in newer Procfile CNB: https://github.com/heroku/cnb-shim/issues/74 --- builder-classic-22/builder.toml | 23 +++++++++++++---------- buildpacks-20/builder.toml | 19 +++++++++++-------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/builder-classic-22/builder.toml b/builder-classic-22/builder.toml index 98759bfc..e379127f 100644 --- a/builder-classic-22/builder.toml +++ b/builder-classic-22/builder.toml @@ -39,9 +39,12 @@ version = "0.17.4" id = "heroku/php" uri = "https://cnb-shim.herokuapp.com/v1/heroku/php?version=0.0.0&name=Heroku+PHP+(Shimmed)" +# We have to use Procfile CNB v2.0.2 in this builder image, since cnb-shim isn't compatible with +# the direct process mode used in newer Procfile CNB: +# https://github.com/heroku/cnb-shim/issues/74 [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" [[buildpacks]] id = "heroku/python" @@ -61,7 +64,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -73,7 +76,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -85,7 +88,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -97,7 +100,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -109,7 +112,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -121,7 +124,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -133,7 +136,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -145,7 +148,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -157,7 +160,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" diff --git a/buildpacks-20/builder.toml b/buildpacks-20/builder.toml index 1213ee23..f5501bf0 100644 --- a/buildpacks-20/builder.toml +++ b/buildpacks-20/builder.toml @@ -35,9 +35,12 @@ version = "0.17.4" id = "heroku/php" uri = "https://cnb-shim.herokuapp.com/v1/heroku/php?version=0.0.0&name=Heroku+PHP+(Shimmed)" +# We have to use Procfile CNB v2.0.2 in this builder image, since cnb-shim isn't compatible with +# the direct process mode used in newer Procfile CNB: +# https://github.com/heroku/cnb-shim/issues/74 [[buildpacks]] id = "heroku/procfile" - uri = "docker://docker.io/heroku/procfile-cnb@sha256:dbf9dd716f869678e8bdaa47dbe7bdb5e5bd39c2e537dbcfb1f22ce613534ab2" + uri = "docker://docker.io/heroku/procfile-cnb@sha256:2549eee29b64c5dc063a3966c65baf1f264389645f54d416a320aa9e20b09592" [[buildpacks]] id = "heroku/python" @@ -57,7 +60,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -69,7 +72,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -81,7 +84,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -93,7 +96,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -105,7 +108,7 @@ version = "0.17.4" version = "0.0.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -117,7 +120,7 @@ version = "0.17.4" version = "2.6.6" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning" @@ -129,7 +132,7 @@ version = "0.17.4" version = "4.1.0" [[order.group]] id = "heroku/procfile" - version = "3.0.0" + version = "2.0.2" optional = true [[order.group]] id = "heroku/builder-eol-warning"