File tree Expand file tree Collapse file tree 4 files changed +32
-11
lines changed Expand file tree Collapse file tree 4 files changed +32
-11
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+ ARG DOCKER_REPO
4+ FROM --platform=linux/${DOCKER_ARCH} ${DOCKER_REPO}debian:${DEBIAN_VERSION} as build_env
45
56RUN apt-get -y update && apt-get -y install gnupg2
67
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,18 +10,18 @@ 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)
2121
2222set -xeo pipefail
2323
24- docker build -t " $docker_image " \
24+ DOCKER_BUILDKIT=1 docker build -t " $docker_image " \
2525 --build-arg " DOCKER_ARCH=$docker_arch " \
2626 --build-arg " DEBIAN_VERSION=$debian_version " \
2727 --build-arg " BUILD_TYPE=$build_type " \
Original file line number Diff line number Diff line change 99 strategy :
1010 matrix :
1111 debian_version : [bullseye, bookworm]
12- docker_arch : [amd64, arm32v7, arm64v8 ]
12+ docker_arch : [amd64, arm/v7, arm64/v8 ]
1313 build_type : [generic, raspi]
1414 exclude :
1515 - docker_arch : amd64
@@ -38,11 +38,21 @@ jobs:
3838 - name : Set up QEMU
3939 uses : docker/setup-qemu-action@v2
4040 - name : Build Dockerfile
41- 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 .
41+ run : |
42+ docker build \
43+ --target deb_make \
44+ --tag deb_make \
45+ --file .github/ci/Dockerfile \
46+ --build-arg GIT_VERSION \
47+ --build-arg DOCKER_ARCH \
48+ --build-arg DEBIAN_VERSION \
49+ --build-arg BUILD_TYPE \
50+ .
4251 env :
4352 DEBIAN_VERSION : ${{ matrix.debian_version }}
44- DOCKER_ARCH : ${{ matrix.docker_arch }}/
53+ DOCKER_ARCH : ${{ matrix.docker_arch }}
4554 BUILD_TYPE : ${{ matrix.build_type }}
55+ DOCKER_BUILDKIT : 1
4656 - name : Create container
4757 run : docker create --name deb_make deb_make
4858 - name : Copy files
Original file line number Diff line number Diff line change 1212 strategy :
1313 matrix :
1414 debian_version : [bullseye, bookworm]
15- docker_arch : [amd64, arm32v7, arm64v8 ]
15+ docker_arch : [amd64, arm/v7, arm64/v8 ]
1616 build_type : [generic, raspi]
1717 exclude :
1818 - docker_arch : amd64
@@ -28,11 +28,21 @@ jobs:
2828 - name : Set up QEMU
2929 uses : docker/setup-qemu-action@v2
3030 - name : Build Dockerfile
31- 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 .
31+ run : |
32+ docker build \
33+ --target deb_make \
34+ --tag deb_make \
35+ --file .github/ci/Dockerfile \
36+ --build-arg GIT_VERSION \
37+ --build-arg DOCKER_ARCH \
38+ --build-arg DEBIAN_VERSION \
39+ --build-arg BUILD_TYPE \
40+ .
3241 env :
3342 DEBIAN_VERSION : ${{ matrix.debian_version }}
34- DOCKER_ARCH : ${{ matrix.docker_arch }}/
43+ DOCKER_ARCH : ${{ matrix.docker_arch }}
3544 BUILD_TYPE : ${{ matrix.build_type }}
45+ DOCKER_BUILDKIT : 1
3646 - name : Create container
3747 run : docker create --name deb_make deb_make
3848 - name : Copy files
You can’t perform that action at this time.
0 commit comments