Skip to content

Update repository structure for future multi-version support #134

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

Merged
merged 1 commit into from
Apr 5, 2017

Conversation

tianon
Copy link
Member

@tianon tianon commented Jan 11, 2017

See #121 (comment) from @michaelklishin upstream pointing out that after 3.7.0, 3.6.x will still be supported (so we might as well start prepping for that change now). 👍

I think the main open question here is what will happen to the Debian repo once we have both 3.6.x and 3.7.x actively supported, since it currently only contains the latest release (likely due to the way reprepro works).

update.sh Outdated
rabbitmqVersion="${debianVersion%%-*}"
for version in "${versions[@]}"; do
# TODO figure out what multi-version looks like here? :(
debianVersion="$(curl -sSL 'http://www.rabbitmq.com/debian/dists/testing/main/binary-amd64/Packages' | grep -m1 -A10 '^Package: rabbitmq-server$' | grep -m1 '^Version: ' | cut -d' ' -f2)"
Copy link
Member Author

Choose a reason for hiding this comment

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

For reference, here's the full contents of this current Packages file:

Package: rabbitmq-server
Version: 3.6.6-1
Architecture: all
Maintainer: RabbitMQ Team <[email protected]>
Installed-Size: 6027
Depends: erlang-nox (>= 1:16.b.3) | esl-erlang, adduser, logrotate, socat, init-system-helpers (>= 1.13~)
Homepage: http://www.rabbitmq.com/
Priority: extra
Section: net
Filename: pool/main/r/rabbitmq-server/rabbitmq-server_3.6.6-1_all.deb
Size: 5439058
SHA256: 44e3a6b0a594d5c7bc4b4b74bd93ed0111777c6ebcbca44e6b49400bb55f3044
SHA1: 5119934e0732e97cb73dbe8561b160b09403f5ac
MD5sum: 0b79cded83dfe3008bb4fc49ba069956
Description: Multi-protocol messaging broker
 RabbitMQ is an open source multi-protocol messaging broker.

@tianon tianon force-pushed the multi-version branch 3 times, most recently from 85febea to 741def1 Compare January 12, 2017 18:30
@tianon
Copy link
Member Author

tianon commented Apr 5, 2017

That was a bit of a crazy rebase due to alpine being added in the interim, but here's the result:

$ diff -u 
	<(bashbrew list rabbitmq | cut -d: -f2) \
	<(bashbrew list <(./generate-stackbrew-library.sh) | cut -d: -f2)

$ ./generate-stackbrew-library.sh
# this file is generated via https://github.com/docker-library/rabbitmq/blob/79277042564875d55e4b05a60c65b6eb46651a94/generate-stackbrew-library.sh

Maintainers: Tianon Gravi <[email protected]> (@tianon),
             Joseph Ferguson <[email protected]> (@yosifkit)
GitRepo: https://github.com/docker-library/rabbitmq.git

Tags: 3.6.9, 3.6, 3, latest
GitCommit: 79277042564875d55e4b05a60c65b6eb46651a94
Directory: 3.6/debian

Tags: 3.6.9-management, 3.6-management, 3-management, management
GitCommit: 79277042564875d55e4b05a60c65b6eb46651a94
Directory: 3.6/debian/management

Tags: 3.6.9-alpine, 3.6-alpine, 3-alpine, alpine
GitCommit: 79277042564875d55e4b05a60c65b6eb46651a94
Directory: 3.6/alpine

Tags: 3.6.9-management-alpine, 3.6-management-alpine, 3-management-alpine, management-alpine
GitCommit: 79277042564875d55e4b05a60c65b6eb46651a94
Directory: 3.6/alpine/management

$ ./update.sh
+ sed -ri -e 's/^(ENV RABBITMQ_VERSION) .*/\1 3.6.9/' -e 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 3.6.9-1/' 3.6/alpine/Dockerfile
+ sed -ri -e 's/^(ENV RABBITMQ_VERSION) .*/\1 3.6.9/' -e 's/^(ENV RABBITMQ_DEBIAN_VERSION) .*/\1 3.6.9-1/' 3.6/debian/Dockerfile

@tianon tianon requested a review from yosifkit April 5, 2017 21:32
@yosifkit yosifkit merged commit 253abcc into docker-library:master Apr 5, 2017
@tianon tianon deleted the multi-version branch April 5, 2017 22:45
tianon added a commit to infosiftr/stackbrew that referenced this pull request Apr 6, 2017
- `docker`: 17.04.0-ce (docker-library/docker#48)
- `mariadb`: resync `mysql` entrypoint (MariaDB/mariadb-docker#102; see also docker-library/mysql#249 and docker-library/mysql#266)
- `percona`: `5.7.17-13-1.jessie`
- `rabbitmq`: multi-version refactoring (docker-library/rabbitmq#134)
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.

2 participants