Fix specific releases and update install instructions.

Fixes #6084

PiperOrigin-RevId: 376293659

2 files changed, 23 insertions, 6 deletions

diff --git a/g3doc/user_guide/install.md b/g3doc/user_guide/install.md
index bcfba0179..321f13ce8 100644
--- a/g3doc/user_guide/install.md
+++ b/g3doc/user_guide/install.md
@@ -138,7 +138,9 @@ sudo add-apt-repository "deb [arch=amd64,arm64] https://storage.googleapis.com/g
 
 ### Specific release
 
-A given release release is available at the following URL:
+Specific releases are the latest [point release](#point-release) for a given
+date. Specific releases should be available for any date that has a point
+release. A given release is available at the following URL:
 
 `https://storage.googleapis.com/gvisor/releases/release/${yyyymmdd}/${ARCH}`
 
@@ -159,7 +161,9 @@ sudo add-apt-repository "deb [arch=amd64,arm64] https://storage.googleapis.com/g
 
 ### Point release
 
-A given point release is available at the following URL:
+Point releases correspond to
+[releases](https://github.com/google/gvisor/releases) tagged in the Github
+repository. A given point release is available at the following URL:
 
 `https://storage.googleapis.com/gvisor/releases/release/${yyyymmdd}.${rc}/${ARCH}`
 
diff --git a/tools/make_release.sh b/tools/make_release.sh
index 10742dd54..e125c7e96 100755
--- a/tools/make_release.sh
+++ b/tools/make_release.sh
@@ -22,8 +22,10 @@ if [[ "$#" -le 2 ]]; then
 fi
 
 set -xeo pipefail
-declare -r private_key="$1"; shift
-declare -r root="$1"; shift
+declare -r private_key="$1"
+shift
+declare -r root="$1"
+shift
 declare -a binaries
 declare -a pkgs
 
@@ -44,7 +46,7 @@ install_raw() {
     name=$(basename "${binary}")
     mkdir -p "${root}/$1/${arch}"
     cp -f "${binary}" "${root}/$1/${arch}"
-    (cd "${root}/$1/${arch}" && sha512sum "${name}" > "${name}.sha512")
+    (cd "${root}/$1/${arch}" && sha512sum "${name}" >"${name}.sha512")
   done
 }
 
@@ -55,7 +57,8 @@ install_apt() {
 
 # If nightly, install only nightly artifacts.
 if [[ "${NIGHTLY:-false}" == "true" ]]; then
-  # The "latest" directory and current date.
+  # Install the nightly release.
+  # https://gvisor.dev/docs/user_guide/install/#nightly
   stamp="$(date -Idate)"
   install_raw "nightly/latest"
   install_raw "nightly/${stamp}"
@@ -69,13 +72,23 @@ else
     for tag in ${tags}; do
       name=$(echo "${tag}" | cut -d'-' -f2)
       base=$(echo "${name}" | cut -d'.' -f1)
+      # Install the "specific" release. This is the latest release with the
+      # given date.
+      # https://gvisor.dev/docs/user_guide/install/#specific-release
+      install_raw "release/${base}"
+      # Install the "point release".
+      # https://gvisor.dev/docs/user_guide/install/#point-release
       install_raw "release/${name}"
+      # Install the latest release.
+      # https://gvisor.dev/docs/user_guide/install/#latest-release
       install_raw "release/latest"
+
       install_apt "release"
       install_apt "${base}"
     done
   else
     # Otherwise, assume it is a raw master commit.
+    # https://gvisor.dev/docs/user_guide/install/#head
     install_raw "master/latest"
     install_apt "master"
   fi