Skip to content

Commit c9b10cb

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

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG DOCKER_ARCH
22
ARG DEBIAN_VERSION
3-
FROM ${DOCKER_ARCH}debian:${DEBIAN_VERSION} as build_env
3+
FROM --platform=linux/${DOCKER_ARCH} ${DOCKER_ARCH}/debian:${DEBIAN_VERSION} as build_env
44

55
RUN apt-get -y update && apt-get -y install gnupg2
66

.github/ci/build-env

Lines changed: 2 additions & 2 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,7 +10,7 @@ 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=""

.github/workflows/build_release.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
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

.github/workflows/build_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
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

0 commit comments

Comments
 (0)