Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

maint: update for heroku-24 #47

Merged
merged 8 commits into from
May 21, 2024
Merged

maint: update for heroku-24 #47

merged 8 commits into from
May 21, 2024

Conversation

mble-sfdc
Copy link
Contributor

@mble-sfdc mble-sfdc commented May 15, 2024

Ref: GUS-W-14682575.

Enumerating objects: 5, done.
Counting objects: 100% (5/5), done.
Delta compression using up to 10 threads
Compressing objects: 100% (2/2), done.
Writing objects: 100% (3/3), 263 bytes | 263.00 KiB/s, done.
Total 3 (delta 1), reused 0 (delta 0), pack-reused 0
remote: Updated 82 paths from 1300fa5
remote: Compressing source files... done.
remote: Building source:
remote: Waiting on build...
remote: Waiting on build... (elapsed: 6s)
remote:
remote: -----> Building on the Heroku-24 stack
remote: -----> Using buildpacks:
remote:        1. https://github.com/heroku/heroku-buildpack-redis.git#mble-sfdc-support-heroku-24
remote:        2. https://github.com/heroku/heroku-buildpack-pgbouncer.git#add-support-for-heroku-24
remote: -----> Redis-stunnel app detected
remote: !     stunnel not detected! stunnel not supported on heroku-24+
remote: !     This buildpack is not required for Redis 6+. Remove this buildpack using:
remote: !         $ heroku buildpacks:remove heroku/redis
remote: !     And then follow the instructions for using Redis' native TLS support:
remote: !     https://devcenter.heroku.com/articles/heroku-redis#security-and-compliance
remote:  !     Push rejected, failed to compile Redis-stunnel app.
remote:
remote:  !     Push failed
remote:  !
remote:  ! ## Warning - The same version of this code has already been built: 3f47d00f92c718e444e865c6667e2014b2d6ab95
remote:  !
remote:  ! We have detected that you have triggered a build from source code with version 3f47d00f92c718e444e865c6667e2014b2d6ab95
remote:  ! at least twice. One common cause of this behavior is attempting to deploy code from a different branch.
remote:  !
remote:  ! If you are developing on a branch and deploying via git you must run:
remote:  !
remote:  !     git push heroku <branchname>:main
remote:  !
remote:  ! This article goes into details on the behavior:
remote:  !   https://devcenter.heroku.com/articles/duplicate-build-version
remote:
remote: Verifying deploy...
remote:
remote: !       Push rejected to brahyt-dev-24.
remote:
To https://git.heroku.com/brahyt-dev-24.git
 ! [remote rejected] main -> main (pre-receive hook declined)
error: failed to push some refs to 'https://git.heroku.com/brahyt-dev-24.git'```

@edmorley
Copy link
Member

@mble-sfdc stunnel has intentionally been removed from Heroku-24 - this buildpack will need to exit 1 on Heroku-24 with a suitable "not supported / not needed with Redis 6+" error message. (And ideally longer term once no stragglers, that same exit 1 and error be used for older stacks too, so people know to remove the now redundant buildpack.)

@edmorley
Copy link
Member

The Heroku-24 image also now defaults to a non-root user, so you'll need a USER root prior to the RUN useradd in Dockerfile.

@mble-sfdc
Copy link
Contributor Author

@edmorley Fantastic, thank you.

Copy link
Member

@edmorley edmorley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for this!

bin/compile Outdated Show resolved Hide resolved
bin/compile Outdated Show resolved Hide resolved
bin/start-stunnel Outdated Show resolved Hide resolved
bin/compile Outdated Show resolved Hide resolved
@mble-sfdc mble-sfdc force-pushed the mble-sfdc-support-heroku-24 branch from ef86f4d to 7b71738 Compare May 17, 2024 11:34
@mble-sfdc mble-sfdc force-pushed the mble-sfdc-support-heroku-24 branch from 7b71738 to 3fdae09 Compare May 17, 2024 11:44
@mble-sfdc
Copy link
Contributor Author

@edmorley updated based on your feedback, thank you!

@mble-sfdc mble-sfdc marked this pull request as ready for review May 17, 2024 12:31
README.md Outdated Show resolved Hide resolved
@brahyt-sf brahyt-sf requested a review from edmorley May 21, 2024 15:19
@brahyt-sf brahyt-sf force-pushed the mble-sfdc-support-heroku-24 branch from 1c3b642 to 8d91de7 Compare May 21, 2024 15:21
@brahyt-sf brahyt-sf force-pushed the mble-sfdc-support-heroku-24 branch from 8d91de7 to b659b4d Compare May 21, 2024 15:22
Copy link
Member

@edmorley edmorley left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you - this is great!

bin/compile Outdated Show resolved Hide resolved
README.md Outdated Show resolved Hide resolved
brahyt-sf and others added 2 commits May 21, 2024 09:16
Co-authored-by: Ed Morley <[email protected]>
Co-authored-by: Ed Morley <[email protected]>
@edmorley
Copy link
Member

I pressed sync on changeling to nudge it to pick up the CI result (since changeling had somehow missed the CI finished event), so the status checks have now passed making this mergeable.

Feel free to merge whenever suits, and once it's merged I'll release to the buildpack registry :-)

@brahyt-sf brahyt-sf merged commit 1d5f717 into main May 21, 2024
4 checks passed
@brahyt-sf brahyt-sf deleted the mble-sfdc-support-heroku-24 branch May 21, 2024 20:47
@edmorley
Copy link
Member

edmorley commented May 21, 2024

Published:

$ h buildpacks:publish heroku/redis main
...
$ h buildpacks:versions heroku/redis | head -n 4
 Version Released At              Status
 ─────── ──────────────────────── ─────────
 8       2024-05-21T21:06:20.329Z published
 7       2021-12-21T09:01:59.397Z published

Looks like the buildpack was not published after #45, so this will be the first time people using the registry URL/alias receive those changes.

@edmorley
Copy link
Member

Full diff of this release:
fdd327a...1d5f717

(aside from #45, all of the other older changes were test/docs only)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants