Skip to content

Commit e5da520

Browse files
committed
Remove now-unnecessary python2/python3 switching code
1 parent 817847d commit e5da520

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

update.sh

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -118,15 +118,6 @@ for version in "${versions[@]}"; do
118118
fi
119119
opensslSourceSha256="$(wget -qO- "https://www.openssl.org/source/openssl-$opensslVersion.tar.gz.sha256")"
120120

121-
# https://github.com/rabbitmq/rabbitmq-management/issues/786
122-
python='python3'
123-
case "$fullVersion" in
124-
3.7.24* | 3.8.3*)
125-
# TODO delete after these versions are gone
126-
python='python'
127-
;;
128-
esac
129-
130121
echo "$version: $fullVersion"
131122

132123
for variant in alpine ubuntu; do
@@ -144,10 +135,10 @@ for version in "${versions[@]}"; do
144135
cp -a docker-entrypoint.sh "$version/$variant/"
145136

146137
managementFrom="rabbitmq:$version"
147-
installPython='apt-get update; apt-get install -y --no-install-recommends '"$python"'; rm -rf /var/lib/apt/lists/*'
138+
installPython='apt-get update; apt-get install -y --no-install-recommends python3; rm -rf /var/lib/apt/lists/*'
148139
if [ "$variant" = 'alpine' ]; then
149140
managementFrom+='-alpine'
150-
installPython="apk add --no-cache $python"
141+
installPython='apk add --no-cache python3'
151142
sed -i 's/gosu/su-exec/g' "$version/$variant/docker-entrypoint.sh"
152143
fi
153144
sed -e "s!%%FROM%%!$managementFrom!g" \

0 commit comments

Comments
 (0)