Skip to content

Commit 34a2da4

Browse files
committed
workflow: add missing --platform to Dockerfile
1 parent 39c8913 commit 34a2da4

File tree

4 files changed

+32
-11
lines changed

4 files changed

+32
-11
lines changed

.github/ci/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
ARG DOCKER_ARCH
22
ARG 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

56
RUN apt-get -y update && apt-get -y install gnupg2
67

.github/ci/build-env

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
if [[ $# -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
66
fi
77

@@ -10,18 +10,18 @@ docker_image="camera_streamer_build_env"
1010
build_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

1616
docker_arch=""
17-
[[ -n "$3" ]] && docker_arch="$3/" && docker_image="${docker_image}_${3}"
17+
[[ -n "$3" ]] && docker_arch="$3" && docker_image="${docker_image}_${3}"
1818

1919
PWD=$(pwd)
2020
ROOT=$(cd -- "$( dirname -- "${BASH_SOURCE[0]}" )/../.." &> /dev/null && pwd)
2121

2222
set -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" \

.github/workflows/build_release.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
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

.github/workflows/build_test.yaml

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
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

0 commit comments

Comments
 (0)