Skip to content

Conversation

@tianon
Copy link
Member

@tianon tianon commented Dec 11, 2025

This is a follow-up to #780 -- I'm happy to discuss any of this further (and to be explicitly clear, I'm very open to changes!) ❤️

  • align on "bashbrew architectures" for representing the architecture strings (matching the Architectures: lines in our downstream library/rabbitmq file; this makes it easier to filter that list later if we so choose)
  • avoid multi-stage build, especially to avoid the empty file copying/weirdness
  • we always need the rabbitmqadmin data, so we should query it before the loop (and pre-process it since the data is the same for every single iteration of the loop)
  • store version in the rabbitmqadmin block (our automation uses this for making nicer commit messages like "Update 4.0 to rabbitmqadmin 2.17.1" instead of just "Update 4.0" which is what the current code will lead to)
  • use dpkg --print-architecture instead of uname -m for architecture detection (the former is "userspace architecture" detection, which more closely matches what we need than the latter's "kernel architecture" detection)

- align on "bashbrew architectures" for representing the architecture strings (matching the `Architectures:` lines in our downstream `library/rabbitmq` file; this makes it easier to filter that list later if we so choose)
- avoid multi-stage build, especially to avoid the empty file copying/weirdness
- we always need the `rabbitmqadmin` data, so we should query it before the loop (and pre-process it since the data is the same for every single iteration of the loop)
- store `version` in the `rabbitmqadmin` block (our automation uses this for making nicer commit messages like "Update 4.0 to rabbitmqadmin 2.17.1" instead of just "Update 4.0" which is what the current code will lead to)
- use `dpkg --print-architecture` instead of `uname -m` for architecture detection (the former is "userspace architecture" detection, which more closely matches what we need than the latter's "kernel architecture" detection)
Copy link
Collaborator

@lukebakken lukebakken left a comment

Choose a reason for hiding this comment

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

👍

@michaelklishin michaelklishin merged commit 0d65bb3 into docker-library:master Dec 11, 2025
14 checks passed
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 11, 2025
Changes:

- docker-library/rabbitmq@0d65bb3: Merge pull request docker-library/rabbitmq#783 from infosiftr/refactor
- docker-library/rabbitmq@c57ff6e: Slightly refactor new `rabbitmqadmin` code
- docker-library/rabbitmq@8e6c07c: Merge pull request docker-library/rabbitmq#780 from lukebakken/lukebakken/docker-librarygh-768-rabbitmqadmin-ng
- docker-library/rabbitmq@dac149a: Add Rust-based `rabbitmqadmin-ng` and remove Python
- docker-library/rabbitmq@14b8a4a: Update 4.0 to openssl 3.5.4
- docker-library/rabbitmq@7264d76: Update 4.0 to openssl 3.5.3
- docker-library/rabbitmq@c879782: Update 4.0 to 4.0.9
- docker-library/rabbitmq@85ee627: Update 4.0 to 4.0.8
- docker-library/rabbitmq@1519c4c: Merge pull request docker-library/rabbitmq#779 from lukebakken/lukebakken/fix-warnings
@yosifkit
Copy link
Member

yosifkit commented Dec 11, 2025

waiting to remove the Python-based version until at least the next patch release if not the next minor/major?

So as to not break users, should we wait for version bumps before we push the alpine-based images that no longer have a rabbitmqadmin or should we go ahead with the changes? i.e. should we add back the python-based version in the alpine images until the next patch of each release series?

@yosifkit yosifkit deleted the refactor branch December 11, 2025 21:05
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 12, 2025
Changes:

- docker-library/rabbitmq@b9786fd: Merge pull request docker-library/rabbitmq#784 from infosiftr/alpine3.23
- docker-library/rabbitmq@f5aa704: Update to Alpine 3.23
- docker-library/rabbitmq@0d65bb3: Merge pull request docker-library/rabbitmq#783 from infosiftr/refactor
- docker-library/rabbitmq@c57ff6e: Slightly refactor new `rabbitmqadmin` code
- docker-library/rabbitmq@8e6c07c: Merge pull request docker-library/rabbitmq#780 from lukebakken/lukebakken/docker-librarygh-768-rabbitmqadmin-ng
- docker-library/rabbitmq@dac149a: Add Rust-based `rabbitmqadmin-ng` and remove Python
- docker-library/rabbitmq@14b8a4a: Update 4.0 to openssl 3.5.4
- docker-library/rabbitmq@7264d76: Update 4.0 to openssl 3.5.3
- docker-library/rabbitmq@c879782: Update 4.0 to 4.0.9
- docker-library/rabbitmq@85ee627: Update 4.0 to 4.0.8
- docker-library/rabbitmq@1519c4c: Merge pull request docker-library/rabbitmq#779 from lukebakken/lukebakken/fix-warnings
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 12, 2025
Changes:

- docker-library/rabbitmq@8991001: Update 4.2 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@9b8508a: Update 4.1 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@a541e82: Update 4.0 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@7496c53: Update 3.13 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@b9786fd: Merge pull request docker-library/rabbitmq#784 from infosiftr/alpine3.23
- docker-library/rabbitmq@f5aa704: Update to Alpine 3.23
- docker-library/rabbitmq@0d65bb3: Merge pull request docker-library/rabbitmq#783 from infosiftr/refactor
- docker-library/rabbitmq@c57ff6e: Slightly refactor new `rabbitmqadmin` code
- docker-library/rabbitmq@8e6c07c: Merge pull request docker-library/rabbitmq#780 from lukebakken/lukebakken/docker-librarygh-768-rabbitmqadmin-ng
- docker-library/rabbitmq@dac149a: Add Rust-based `rabbitmqadmin-ng` and remove Python
- docker-library/rabbitmq@14b8a4a: Update 4.0 to openssl 3.5.4
- docker-library/rabbitmq@7264d76: Update 4.0 to openssl 3.5.3
- docker-library/rabbitmq@c879782: Update 4.0 to 4.0.9
- docker-library/rabbitmq@85ee627: Update 4.0 to 4.0.8
- docker-library/rabbitmq@1519c4c: Merge pull request docker-library/rabbitmq#779 from lukebakken/lukebakken/fix-warnings
docker-library-bot added a commit to docker-library-bot/official-images that referenced this pull request Dec 12, 2025
Changes:

- docker-library/rabbitmq@f3ddb20: Merge pull request docker-library/rabbitmq#785 from infosiftr/drop-3.13
- docker-library/rabbitmq@4395f70: Drop support for 3.13
- docker-library/rabbitmq@8991001: Update 4.2 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@9b8508a: Update 4.1 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@a541e82: Update 4.0 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@7496c53: Update 3.13 to rabbitmqadmin 2.18.0
- docker-library/rabbitmq@b9786fd: Merge pull request docker-library/rabbitmq#784 from infosiftr/alpine3.23
- docker-library/rabbitmq@f5aa704: Update to Alpine 3.23
- docker-library/rabbitmq@0d65bb3: Merge pull request docker-library/rabbitmq#783 from infosiftr/refactor
- docker-library/rabbitmq@c57ff6e: Slightly refactor new `rabbitmqadmin` code
- docker-library/rabbitmq@8e6c07c: Merge pull request docker-library/rabbitmq#780 from lukebakken/lukebakken/docker-librarygh-768-rabbitmqadmin-ng
- docker-library/rabbitmq@dac149a: Add Rust-based `rabbitmqadmin-ng` and remove Python
- docker-library/rabbitmq@14b8a4a: Update 4.0 to openssl 3.5.4
- docker-library/rabbitmq@7264d76: Update 4.0 to openssl 3.5.3
- docker-library/rabbitmq@c879782: Update 4.0 to 4.0.9
- docker-library/rabbitmq@85ee627: Update 4.0 to 4.0.8
- docker-library/rabbitmq@1519c4c: Merge pull request docker-library/rabbitmq#779 from lukebakken/lukebakken/fix-warnings
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.

4 participants