Skip to content

Commit

Permalink
Remove CNB_TARGET_* env vars workaround (#260)
Browse files Browse the repository at this point in the history
These were added recently in #251 to work around this upstream
`lifecycle` bug:
buildpacks/lifecycle#1308

The fix for that has since been released in lifecycle 0.19.0:
https://github.com/buildpacks/lifecycle/releases/tag/v0.19.0

Which our builder images are now using:
heroku/cnb-builder-images#475

As such, we no longer need the workaround here (and in fact, setting
these env vars now cannot have an effect, since `lifecycle` now ignores
them).

GUS-W-15225541.
  • Loading branch information
edmorley authored Mar 11, 2024
1 parent c1ad0de commit 150553d
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 6 deletions.
2 changes: 0 additions & 2 deletions heroku-20-cnb-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ RUN mkdir /app && \
ENV CNB_USER_ID=1000
ENV CNB_GROUP_ID=1000
ENV CNB_STACK_ID "heroku-20"
ENV CNB_TARGET_OS="linux"
ENV CNB_TARGET_ARCH="amd64"

LABEL io.buildpacks.stack.id="heroku-20"

Expand Down
2 changes: 0 additions & 2 deletions heroku-22-cnb-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ RUN mkdir /app && \
ENV CNB_USER_ID=1000
ENV CNB_GROUP_ID=1000
ENV CNB_STACK_ID "heroku-22"
ENV CNB_TARGET_OS="linux"
ENV CNB_TARGET_ARCH="amd64"

LABEL io.buildpacks.stack.id="heroku-22"

Expand Down
2 changes: 0 additions & 2 deletions heroku-24-build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,3 @@ USER 1002
ENV CNB_USER_ID=1002
ENV CNB_GROUP_ID=1000
ENV CNB_STACK_ID "heroku-24"
ENV CNB_TARGET_OS=$TARGETOS
ENV CNB_TARGET_ARCH=$TARGETARCH

0 comments on commit 150553d

Please sign in to comment.