From fbf4e30f71a1239244f29f6858d3b2f101dc4cdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= <ayufan@ayufan.eu>
Date: Sun, 4 Sep 2022 18:48:12 +0000
Subject: [PATCH] Fix `build-env` script

---
 Dockerfile |  6 ++++--
 build-env  | 19 ++++++++++++-------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ad7700b..c9ab035 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,12 @@
 ARG DOCKER_ARCH
-FROM ${DOCKER_ARCH}debian:bullseye as build_env
+ARG DEBIAN_VERSION
+FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env
 
 # Default packages
 RUN apt-get -y update && apt-get -y install gnupg2 libavformat-dev libavutil-dev libavcodec-dev v4l-utils pkg-config xxd build-essential ccache
 
 # Add RPI packages
-RUN echo "deb http://archive.raspberrypi.org/debian/ bullseye main" > /etc/apt/sources.list.d/raspi.list
+ARG DEBIAN_VERSION
+RUN echo "deb http://archive.raspberrypi.org/debian/ $DEBIAN_VERSION main" > /etc/apt/sources.list.d/raspi.list
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E
 RUN apt-get -y update && apt-get -y install libcamera-dev liblivemedia-dev
diff --git a/build-env b/build-env
index a3b10d5..7d390db 100755
--- a/build-env
+++ b/build-env
@@ -1,21 +1,26 @@
 #!/bin/bash
 
-if [[ $# -gt 1 ]]; then
-  echo "usage: $0 <amd64|arm32v7|arm64v8>"
+if [[ $# -gt 2 ]]; then
+  echo "usage: $0 <buster|bullseye> <amd64|arm32v7|arm64v8>"
   exit 1
 fi
 
-docker_arch=""
 docker_image="camera_streamer_build_env"
-[[ -n "$1" ]] && docker_arch="$1/" && docker_image="${build_env}:${1}"
 
-echo "$UID"
+debian_version="bullseye"
+[[ -n "$1" ]] && debian_version="$1" && docker_image="${docker_image}_${1}"
+
+docker_arch=""
+[[ -n "$2" ]] && docker_arch="$2/" && docker_image="${docker_image}_${2}"
 
 PWD=$(pwd)
 ROOT=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
 
 set -xeo pipefail
 
-docker build -t "$docker_image" --build-arg "DOCKER_ARCH=$docker_arch" --target build_env - < Dockerfile
+docker build -t "$docker_image" \
+  --build-arg "DOCKER_ARCH=$docker_arch" \
+  --build-arg "DEBIAN_VERSION=$debian_version" \
+  --target build_env - < Dockerfile
 
-exec docker run --rm -it -u "$UID" -v "$ROOT" -w "$ROOT" "$docker_image"
+exec docker run --rm -it -u "$UID" -v "$ROOT:$ROOT" -w "$ROOT" "$docker_image"