Skip to content

Conversation

@mergify
Copy link

@mergify mergify bot commented Jan 31, 2025

NOTE: this PR only affects the image we build for our testing purposes (pivotalrabbitmq/rabbitmq) and not the one used by users (called rabbtimq and maintained by Docker)

TODO: currently the PR pushes images to pivotalrabbitmq/rabbitmq-test. After the review, I'll change it to push to pivotalrabbitmq/rabbitmq. DONE

Changes included in this PR:

  • simplification of the action and Dockerfile (+60 -554 lines)
  • less maintenance - since we use the erlang image as the base, we get the regular updates for free (in the past we had to manually bump Erlang/OpenSSL)
  • the actions will no longer recompile erlang/openssl (which happened more often than it should)
  • an image build can now be triggered manually with any Erlang version and with an option to build an ARM64 image
  • by default we now build the image with OTP27 (OTP27 is used for compilation and at runtime)

If we backport this PR to v4.0.x, we should probably change the default OTP version to 26 in the backport


This is an automatic backport of pull request #13160 done by Mergify.

* use the official erlang image as the base
  (no more openssl and erlang recompilation)
* by default, build with OTP27 for x86 only but make it
  easy to request any other OTP version and an ARM64 image
* better docker layer caching
* simplify the workflow and the Dockerfile

(cherry picked from commit e796b61)

# Conflicts:
#	.github/workflows/oci-arm64-make.yaml
#	.github/workflows/oci-make.yaml
(cherry picked from commit 0e7b53c)
@mergify mergify bot added the conflicts label Jan 31, 2025
@mergify
Copy link
Author

mergify bot commented Jan 31, 2025

Cherry-pick of e796b61 has failed:

On branch mergify/bp/v4.0.x/pr-13160
Your branch is up to date with 'origin/v4.0.x'.

You are currently cherry-picking commit e796b61f4.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   packaging/docker-image/Dockerfile

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by them: .github/workflows/oci-arm64-make.yaml
	both modified:   .github/workflows/oci-make.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot mentioned this pull request Jan 31, 2025
@michaelklishin michaelklishin merged commit e285f04 into v4.0.x Jan 31, 2025
258 of 266 checks passed
@michaelklishin michaelklishin deleted the mergify/bp/v4.0.x/pr-13160 branch January 31, 2025 17:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants