File tree Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Expand file tree Collapse file tree 4 files changed +6
-6
lines changed Original file line number Diff line number Diff line change 11ARG DOCKER_ARCH
22ARG DEBIAN_VERSION
3- FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env
3+ FROM --platform=linux/ ${DOCKER_ARCH} debian:${DEBIAN_VERSION} as build_env
44
55RUN apt-get -y update && apt-get -y install gnupg2
66
Original file line number Diff line number Diff line change 11#! /bin/bash
22
33if [[ $# -lt 3 ]]; then
4- echo " usage: $0 <generic|raspi> <buster| bullseye> <amd64|arm32v7|arm64v8>"
4+ echo " usage: $0 <generic|raspi> <bullseye|bookworm > <amd64|arm32v7|arm64v8>"
55 exit 1
66fi
77
@@ -10,11 +10,11 @@ docker_image="camera_streamer_build_env"
1010build_type=" raspi"
1111[[ -n " $1 " ]] && build_type=" $1 "
1212
13- debian_version=" bullseye "
13+ debian_version=" bookworm "
1414[[ -n " $2 " ]] && debian_version=" $2 " && docker_image=" ${docker_image} _${2} "
1515
1616docker_arch=" "
17- [[ -n " $3 " ]] && docker_arch=" $3 / " && docker_image=" ${docker_image} _${3} "
17+ [[ -n " $3 " ]] && docker_arch=" $3 " && docker_image=" ${docker_image} _${3} "
1818
1919PWD=$( pwd)
2020ROOT=$( cd -- " $( dirname -- " ${BASH_SOURCE[0]} " ) /../.." & > /dev/null && pwd)
Original file line number Diff line number Diff line change 4141 run : docker build --target deb_make --tag deb_make --file .github/ci/Dockerfile --build-arg GIT_VERSION --build-arg DOCKER_ARCH --build-arg DEBIAN_VERSION --build-arg BUILD_TYPE .
4242 env :
4343 DEBIAN_VERSION : ${{ matrix.debian_version }}
44- DOCKER_ARCH : ${{ matrix.docker_arch }}/
44+ DOCKER_ARCH : ${{ matrix.docker_arch }}
4545 BUILD_TYPE : ${{ matrix.build_type }}
4646 - name : Create container
4747 run : docker create --name deb_make deb_make
Original file line number Diff line number Diff line change 3131 run : docker build --target deb_make --tag deb_make --file .github/ci/Dockerfile --build-arg GIT_VERSION --build-arg DOCKER_ARCH --build-arg DEBIAN_VERSION --build-arg BUILD_TYPE .
3232 env :
3333 DEBIAN_VERSION : ${{ matrix.debian_version }}
34- DOCKER_ARCH : ${{ matrix.docker_arch }}/
34+ DOCKER_ARCH : ${{ matrix.docker_arch }}
3535 BUILD_TYPE : ${{ matrix.build_type }}
3636 - name : Create container
3737 run : docker create --name deb_make deb_make
You can’t perform that action at this time.
0 commit comments