docker-library
/
rabbitmq
mirror of https://github.com/docker-library/rabbitmq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #394 from gerhard/default-to-python3 

Use Python 3 explicitly for rabbitmqadmin in Ubuntu
This commit is contained in:
Tianon Gravi 2020-03-23 17:00:50 -07:00 committed by GitHub
parent 84fc3639bf 28ec81f254
commit 0b47a9fb75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
update.sh
View File

@ -119,6 +119,15 @@ for version in "${versions[@]}"; do
fi fi
opensslSourceSha256="$(wget -qO- "https://www.openssl.org/source/openssl-$opensslVersion.tar.gz.sha256")" opensslSourceSha256="$(wget -qO- "https://www.openssl.org/source/openssl-$opensslVersion.tar.gz.sha256")"
# https://github.com/rabbitmq/rabbitmq-management/issues/786
python='python3'
case "$fullVersion" in
3.7.24* | 3.8.3*)
# TODO delete after these versions are gone
python='python'
;;
esac
echo "$version: $fullVersion" echo "$version: $fullVersion"
for variant in alpine ubuntu; do for variant in alpine ubuntu; do
@ -136,10 +145,10 @@ for version in "${versions[@]}"; do
cp -a docker-entrypoint.sh "$version/$variant/" cp -a docker-entrypoint.sh "$version/$variant/"
managementFrom="rabbitmq:$version" managementFrom="rabbitmq:$version"
installPython='apt-get update; apt-get install -y --no-install-recommends python; rm -rf /var/lib/apt/lists/*' installPython='apt-get update; apt-get install -y --no-install-recommends '"$python"'; rm -rf /var/lib/apt/lists/*'
if [ "$variant" = 'alpine' ]; then if [ "$variant" = 'alpine' ]; then
managementFrom+='-alpine' managementFrom+='-alpine'
installPython='apk add --no-cache python' installPython="apk add --no-cache $python"
sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh" sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh"
fi fi
sed -e "s!%%FROM%%!$managementFrom!g" \ sed -e "s!%%FROM%%!$managementFrom!g" \