-
Notifications
You must be signed in to change notification settings - Fork 462
Refactor update.sh and add versions.json
#408
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
Conversation
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
This commit includes no functional changes besides a new debug info. Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
This commit includes no functional changes. Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
'versions.json' contains information about the latest branches (currently phpMyAdmin 5.2 only) and variants. It was inspired by PHP's official Docker image and is managed by `update.sh`. There's no need to edit this file manually, just run `update.sh`. Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
Signed-off-by: Daniel Rudolf <github.com@daniel-rudolf.de>
|
I don't think that the failing test is related to these changes. |
Can you give us some code to better understand your use case ? |
|
|
Any updates on this @williamdes @ibennetch? If you just don't want it, just say so, no need to keep this open then. If you plan to merge it but want specific changes we've talked about but disagree (like the If you need more info (for some more reasoning, see e.g. MariaDB/mariadb-docker#516 (comment)), say so, I'm happy to provide what I can. |
Let's be honest, until now I do not see us wanting the change of the Dockerfile and versions.json You also can do it but with a rebase :) |
This PR is about adding a I don't think that investing more work here just to get something merged that is neither used nor wished makes much sense. So I'm closing this now. Thanks for your review. |
Okay, the other changes to refactor the file where good ones. Do you mind if I pick them ? |
Sure, go ahead 👍 😃 |
This reverts commit 6d73dc8.
This reverts commit 5d0a2c22adbb918ceb11d84eaddeff0750df759d.
This reverts commit bc440d32df7d8a2eea760fd85ae81564f7b77be8.
This reverts commit 25b588cca10026c25bb856f6fb8bba2767e7af9a.
This reverts commit f5606d330139fca0dcb6ab97ac4826c5cbed1803.
Ref: 271a3e6 [ci skip]
williamdes
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you @PhrozenByte !
Most of your work is kept, I made some reverts in separate commits.
We can still revert the reverts if we change our minds
|
After random searches, I found out that |
Refactor
update.shto better incorporate the newversions.json(see below). The changes are rather minor, they just look like a rewrite due to general code cleanups and moving stuff around. Simply check the commits, you can review all changes on a per-commit-basis. This includes the following changes:set -eu -o pipefail(instead of justset -e)create_variantfunctionupdate.shThe main feature of this PR is adding a new
versions.json(e68cbb8).versions.jsoncontains information about the latest phpMyAdmin branches (currently just phpMyAdmin 5.2) and container variants available.It was inspired by PHP's
versions.json, but was adapted to better fit phpMyAdmin's needs. The information inversions.jsonis currently scattered across the repo and often just accessible by humans, e.g. right now it's impossible to reliably determine the latest full version of containerized phpMyAdmin programmatically. The only way is to either fiddle around withsedon the Dockerfile, or to build the container.versions.jsonis managed by./update.sh. There's no need to edit this file manually (even when adding/removing variants and/or versions), just run./update.sh. See 6d73dc8 for an example.Changelog was updated accordingly, too (271a3e6).
{ "5.2": { "branch": "5.2", "version": "5.2.1", "sha256": "373f9599dfbd96d6fe75316d5dad189e68c305f297edf42377db9dd6b41b2557", "url": "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz", "ascUrl": "https://files.phpmyadmin.net/phpMyAdmin/5.2.1/phpMyAdmin-5.2.1-all-languages.tar.xz.asc", "variants": { "apache": { "variant": "apache", "base": "debian", "phpVersion": "8.1" }, "fpm": { "variant": "fpm", "base": "debian", "phpVersion": "8.1" }, "fpm-alpine": { "variant": "fpm-alpine", "base": "alpine", "phpVersion": "8.1" } } } }