feat(container): Allow non-default branch selection

Author: oliversalzburg

packages/documentation/docs/development.md

@@ -64,6 +64,14 @@ If you ever want to [rebuild the container from scratch](/reference/Repository S
 yarn devcontainer:rebuild
 ```
 
+### Kittens Game Branch
+
+You can run the development container on another branch of Kittens Game by providing the branch name to the `devcontainer` commands, like so:
+
+```shell
+yarn devcontainer:run dev/alpha
+```
+
 ## Development without Container
 
 To develop without containers, you can build a development version of the userscript with full debugging information.

packages/kitten-game/Dockerfile

@@ -1,9 +1,12 @@
 FROM node:18-buster
 
+ARG BRANCH=master
+
 EXPOSE 8080
 
 RUN git clone https://bitbucket.org/bloodrizer/kitten-game.git && \
   cd kitten-game && \
+  git checkout $BRANCH && \
   yarn install
 
 # Copy the script that injects kitten-scientists.inject.js into index.html and execute it.

packages/kitten-game/package.json

@@ -15,8 +15,8 @@
   },
   "main": "Dockerfile",
   "scripts": {
-    "devcontainer:build": "docker build --tag kitten-game .",
-    "devcontainer:rebuild": "docker build --no-cache --tag kitten-game .",
+    "devcontainer:build": "bash ./scripts/build-development-container.sh",
+    "devcontainer:rebuild": "bash ./scripts/rebuild-development-container.sh",
     "devcontainer:run": "bash ./scripts/run-development-container.sh"
   }
 }

packages/kitten-game/scripts/build-development-container.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+BRANCH=${1:-master}
+
+echo "Building development container on $BRANCH branch..."
+export DOCKER_SCAN_SUGGEST=false
+docker build \
+  --build-arg BRANCH="$BRANCH" \
+  --tag kitten-game .
+echo "Done."

packages/kitten-game/scripts/rebuild-development-container.sh

@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -o errexit
+
+BRANCH=${1:-master}
+
+echo "Re-Building development container on $BRANCH branch..."
+export DOCKER_SCAN_SUGGEST=false
+docker build \
+  --build-arg BRANCH="$BRANCH" \
+  --no-cache \
+  --tag kitten-game .
+echo "Done."

packages/kitten-game/scripts/run-development-container.sh

@@ -3,13 +3,14 @@
 set -o errexit
 
 BASEDIR=$(dirname "$(readlink -f "$0")")
+BRANCH=${1:-master}
 
 yarn userscript:build
-yarn devcontainer:build
+yarn devcontainer:build "$BRANCH"
 
 echo "Removing previous container..."
-docker stop kitten-game || true
-docker rm kitten-game || true
+docker stop kitten-game > /dev/null || true
+docker rm kitten-game > /dev/null || true
 echo "Previous container removed or non-existent."
 echo ""