jordan/camera-streamer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build-env script

Browse Source
This commit is contained in:
Kamil Trzciński 2022-09-04 18:48:12 +00:00
parent 6eaaa57d0b
commit fbf4e30f71
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -1,10 +1,12 @@
ARG DOCKER_ARCH 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 # 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 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 # 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-key adv --keyserver keyserver.ubuntu.com --recv-keys 82B129927FA3303E
RUN apt-get -y update && apt-get -y install libcamera-dev liblivemedia-dev RUN apt-get -y update && apt-get -y install libcamera-dev liblivemedia-dev

19
build-env
View File

@ -1,21 +1,26 @@
#!/bin/bash #!/bin/bash
if [[ $# -gt 1 ]]; then if [[ $# -gt 2 ]]; then
echo "usage: $0 <amd64|arm32v7|arm64v8>" echo "usage: $0 <buster|bullseye> <amd64|arm32v7|arm64v8>"
exit 1 exit 1
fi fi
docker_arch=""
docker_image="camera_streamer_build_env" 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) PWD=$(pwd)
ROOT=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd) ROOT=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd)
set -xeo pipefail 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"