Skip to content

Commit 11a659d

Browse files
committed
remove code to handle nightly and edge channels
Thse channels have been deprecated for quite a while, and the script has produced an error for them for a long time, so nobody using this script can depend on it being there. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1 parent 357b0b4 commit 11a659d

File tree

2 files changed

+2
-11
lines changed

2 files changed

+2
-11
lines changed

install.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ VERSION="${VERSION#v}"
8888
# The channel to install from:
8989
# * stable
9090
# * test
91-
# * edge (deprecated)
92-
# * nightly (deprecated)
9391
DEFAULT_CHANNEL_VALUE="stable"
9492
if [ -z "$CHANNEL" ]; then
9593
CHANNEL=$DEFAULT_CHANNEL_VALUE
@@ -149,10 +147,6 @@ esac
149147
case "$CHANNEL" in
150148
stable|test)
151149
;;
152-
edge|nightly)
153-
>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and is no longer supported by this script."
154-
exit 1
155-
;;
156150
*)
157151
>&2 echo "unknown CHANNEL '$CHANNEL': use either stable or test."
158152
exit 1

rootless-install.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ STABLE_LATEST="27.0.3"
2626
# The channel to install from:
2727
# * test
2828
# * stable
29-
# * nightly (deprecated)
3029
DEFAULT_CHANNEL_VALUE="stable"
3130
if [ -z "$CHANNEL" ]; then
3231
CHANNEL=$DEFAULT_CHANNEL_VALUE
@@ -48,11 +47,9 @@ case "$CHANNEL" in
4847
STATIC_RELEASE_URL="https://download.docker.com/linux/static/$CHANNEL/$(uname -m)/docker-${TEST_LATEST}.tgz"
4948
STATIC_RELEASE_ROOTLESS_URL="https://download.docker.com/linux/static/$CHANNEL/$(uname -m)/docker-rootless-extras-${TEST_LATEST}.tgz"
5049
;;
51-
"nightly")
52-
>&2 echo "DEPRECATED: the nightly channel has been deprecated and is no longer supported by this script."; exit 1
53-
;;
5450
*)
55-
>&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\" or \"test\"."; exit 1
51+
>&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\" or \"test\"."
52+
exit 1
5653
;;
5754
esac
5855

0 commit comments

Comments
 (0)