fixup! chore: update release workflow to use new build scripts

coder · deansheather · Jun 18, 2022 · Jun 7, 2022 · Jun 8, 2022 · Jun 8, 2022
commit 59cd2c70f69c86706563ddd88a47b4c6e3555173
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -24,7 +24,7 @@ on:
 # In a non-snapshot we want the ./scripts/version.sh script to never generate a
 # +dev version.
 env:
-  CODER_NO_DEV_VERSION: ${{ github.event.inputs.snapshot || 'true' }}
+  CODER_NO_DEV_VERSION: ${{ github.event.inputs.snapshot && '' || 'true' }}
 
 jobs:
   linux-windows:

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,16 @@
 FROM alpine
 
+# LABEL doesn't add any real layers so it's fine (and easier) to do it here than
+# in the build script.
+ARG CODER_VERSION
+LABEL \
+	org.opencontainers.image.title="Coder" \
+	org.opencontainers.image.description="A tool for provisioning self-hosted development environments with Terraform." \
+	org.opencontainers.image.url="https://github.com/coder/coder" \
+	org.opencontainers.image.source="https://github.com/coder/coder" \
+	org.opencontainers.image.version="$CODER_VERSION" \
+	org.opencontainers.image.licenses="AGPL-3.0"
+
 # The coder binary is injected by scripts/build_docker.sh.
 ADD coder /opt/coder
 

diff --git a/scripts/build_docker.sh b/scripts/build_docker.sh
@@ -92,14 +92,9 @@ ln -P Dockerfile "$temp_dir/"
 cd "$temp_dir"
 
 build_args=(
-	"--platform=$arch"
-	"--label=org.opencontainers.image.title=Coder"
-	"--label=org.opencontainers.image.description=A tool for provisioning self-hosted development environments with Terraform."
-	"--label=org.opencontainers.image.url=https://github.com/coder/coder"
-	"--label=org.opencontainers.image.source=https://github.com/coder/coder"
-	"--label=org.opencontainers.image.version=$version"
-	"--label=org.opencontainers.image.licenses=AGPL-3.0"
-	"--tag=$image_tag"
+	--platform "$arch"
+	--build-arg "CODER_VERSION=$version"
+	--tag "$image_tag"
 )
 
 log "--- Building Docker image for $arch ($image_tag)"

diff --git a/scripts/build_docker_multiarch.sh b/scripts/build_docker_multiarch.sh
@@ -59,6 +59,7 @@ for image_tag in "$@"; do
 	create_args+=(--amend "$image_tag")
 done
 
+# Sadly, multi-arch images don't seem to support labels.
 output_tag="$(execrelative ./image_tag.sh --version "$version")"
 log "--- Creating multi-arch Docker image ($output_tag)"
 docker manifest create \

diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -6,6 +6,27 @@
 
 set -euo pipefail
 
+# realpath returns an absolute path to the given relative path. It will fail if
+# the parent directory of the path does not exist. Make sure you are in the
+# expected directory before running this to avoid errors.
+#
+# GNU realpath relies on coreutils, which are not installed or the default on
+# Macs out of the box, so we have this mostly working bash alternative instead.
+#
+# Taken from https://stackoverflow.com/a/3915420 (CC-BY-SA 4.0)
+realpath() {
+	dir="$(dirname "$1")"
+	base="$(basename "$1")"
+	if [[ ! -d "$dir" ]]; then
+		error "Could not change directory to '$dir': directory does not exist"
+	fi
+	echo "$(
+		cd "$dir" || error "Could not change directory to '$dir'"
+		pwd -P
+	)"/"$base"
+}
+
+# We have to define realpath before these otherwise it fails on Mac's bash.
 SCRIPT_DIR="$(realpath "$(dirname "${BASH_SOURCE[0]}")")"
 PROJECT_ROOT="$(cd "$SCRIPT_DIR" && realpath "$(git rev-parse --show-toplevel)")"
 
@@ -40,26 +61,6 @@ execrelative() {
 	popd
 }
 
-# realpath returns an absolute path to the given relative path. It will fail if
-# the parent directory of the path does not exist. Make sure you are in the
-# expected directory before running this to avoid errors.
-#
-# GNU realpath relies on coreutils, which are not installed or the default on
-# Macs out of the box, so we have this mostly working bash alternative instead.
-#
-# Taken from https://stackoverflow.com/a/3915420 (CC-BY-SA 4.0)
-realpath() {
-	dir="$(dirname "$1")"
-	base="$(basename "$1")"
-	if [[ ! -d "$dir" ]]; then
-		error "Could not change directory to '$dir': directory does not exist"
-	fi
-	echo "$(
-		cd "$dir" || error "Could not change directory to '$dir'"
-		pwd -P
-	)"/"$base"
-}
-
 # maybedryrun prints the given program and flags, and then, if the first
 # argument is 0, executes it. The reason the first argument should be 0 is that
 # it is expected that you have a dry_run variable in your script that is set to