VirtualBox people have difficult version numbering. Allow for the alp…

…ha char in the macOS version.
kaosagnt · Sep 7, 2023 · 5ac22a7 · 5ac22a7
1 parent 83bda1e
commit 5ac22a7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Dockerfile.osx b/Dockerfile.osx
@@ -9,6 +9,7 @@ ARG DOCKER_MACHINE_VERSION
 ARG GITLAB_MACHINE_VERSION
 ARG T2D_MACHINE_VERSION
 ARG VBOX_VERSION
+ARG VBOX_VERSION_ALPHA
 ARG VBOX_REV
 ARG MIXPANEL_TOKEN
 
@@ -38,7 +39,7 @@ RUN curl -fsSL https://github.com/mackyle/xar/archive/xar-1.6.1.tar.gz | tar xvz
 
 ENV VBOX_DIR https://download.virtualbox.org/virtualbox/$VBOX_VERSION
 
-RUN curl -fsSL -o /vbox.dmg "$VBOX_DIR/VirtualBox-$VBOX_VERSION-$VBOX_REV-OSX.dmg" \
+RUN curl -fsSL -o /vbox.dmg "$VBOX_DIR/VirtualBox-$VBOX_VERSION$VBOX_VERSION_ALPHA-$VBOX_REV-OSX.dmg" \
 	&& echo "$(curl -fsSL "$VBOX_DIR"'/SHA256SUMS' | awk '$2 ~ /-OSX.dmg$/ { print $1 }') */vbox.dmg" | sha256sum -c -
 
 # Why '--strip-components 3'?  The client binary is in usr/local/bin/docker in

diff --git a/script/build-osx b/script/build-osx
@@ -15,6 +15,7 @@ docker build \
 	--build-arg GITLAB_MACHINE_VERSION="${GITLAB_MACHINE_VERSION}" \
 	--build-arg T2D_MACHINE_VERSION="${T2D_MACHINE_VERSION}" \
 	--build-arg VBOX_VERSION="${VBOX_VERSION}" \
+	--build-arg VBOX_VERSION_ALPHA="${VBOX_VERSION_ALPHA}" \
 	--build-arg VBOX_REV="${VBOX_REV}" \
 	--build-arg MIXPANEL_TOKEN="${MIXPANEL_TOKEN}" \
 	.

diff --git a/versions b/versions
@@ -8,7 +8,8 @@ GITLAB_MACHINE_VERSION=gitlab.18
 T2D_MACHINE_VERSION=t2d.4
 GIT_VERSION=2.42.0
 GIT_REVISION=1
-VBOX_VERSION=6.1.46a
+VBOX_VERSION=6.1.46
+VBOX_VERSION_ALPHA=a
 VBOX_REV=158378
 VBOX_VERSION_WIN=7.0.10
 VBOX_REV_WIN=158379