Skip to content

Commit

Permalink
Merge pull request #428 from thaJeztah/remove_nightly_edge
Browse files Browse the repository at this point in the history
remove code to handle nightly and edge channels
  • Loading branch information
vvoland authored Jul 8, 2024
2 parents 357b0b4 + 11a659d commit fe5e7d3
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
6 changes: 0 additions & 6 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,8 +88,6 @@ VERSION="${VERSION#v}"
# The channel to install from:
# * stable
# * test
# * edge (deprecated)
# * nightly (deprecated)
DEFAULT_CHANNEL_VALUE="stable"
if [ -z "$CHANNEL" ]; then
CHANNEL=$DEFAULT_CHANNEL_VALUE
Expand Down Expand Up @@ -149,10 +147,6 @@ esac
case "$CHANNEL" in
stable|test)
;;
edge|nightly)
>&2 echo "DEPRECATED: the $CHANNEL channel has been deprecated and is no longer supported by this script."
exit 1
;;
*)
>&2 echo "unknown CHANNEL '$CHANNEL': use either stable or test."
exit 1
Expand Down
7 changes: 2 additions & 5 deletions rootless-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ STABLE_LATEST="27.0.3"
# The channel to install from:
# * test
# * stable
# * nightly (deprecated)
DEFAULT_CHANNEL_VALUE="stable"
if [ -z "$CHANNEL" ]; then
CHANNEL=$DEFAULT_CHANNEL_VALUE
Expand All @@ -48,11 +47,9 @@ case "$CHANNEL" in
STATIC_RELEASE_URL="https://download.docker.com/linux/static/$CHANNEL/$(uname -m)/docker-${TEST_LATEST}.tgz"
STATIC_RELEASE_ROOTLESS_URL="https://download.docker.com/linux/static/$CHANNEL/$(uname -m)/docker-rootless-extras-${TEST_LATEST}.tgz"
;;
"nightly")
>&2 echo "DEPRECATED: the nightly channel has been deprecated and is no longer supported by this script."; exit 1
;;
*)
>&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\" or \"test\"."; exit 1
>&2 echo "Aborting because of unknown CHANNEL \"$CHANNEL\". Set \$CHANNEL to either \"stable\" or \"test\"."
exit 1
;;
esac

Expand Down

0 comments on commit fe5e7d3

Please sign in to comment.