bstein/lesavka
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: bstein:cd457d4e8847effab3bb97ed61872c8e96c5cd4e
Branches Tags
bstein:master
bstein:recovery/lesavka-master-consolidated-20260414
bstein:feature/webcam-caps
bstein:feature/webcam
...
compare: bstein:b6187bdf85b588f02333ee972674aada2a3f3189
Branches Tags
bstein:master
bstein:recovery/lesavka-master-consolidated-20260414
bstein:feature/webcam-caps
bstein:feature/webcam

2 Commits
cd457d4e88 ... b6187bdf85

Author SHA1 Message Date
Brad Stein
b6187bdf85 ci: bump docker builder rust toolchain 2026-04-12 11:08:31 -03:00
Brad Stein
b1a5538799 ci: fix local image buildx load platform 2026-04-12 11:08:31 -03:00
3 changed files with 10 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
docker/client.Dockerfile
View File

@ -1,4 +1,4 @@
FROM rust:1.87-bookworm AS builder FROM rust:1.88-bookworm AS builder
WORKDIR /src WORKDIR /src

2
docker/server.Dockerfile
View File

@ -1,4 +1,4 @@
FROM rust:1.87-bookworm AS builder FROM rust:1.88-bookworm AS builder
WORKDIR /src WORKDIR /src

10
scripts/ci/build-images.sh
View File

@ -18,18 +18,24 @@ should_push() {
build_with_buildx() { build_with_buildx() {
local dockerfile=$1 local dockerfile=$1
local image=$2 local image=$2
local platform_args=()
if should_push; then if should_push; then
platform_args=(--platform "${PLATFORMS}")
docker buildx build \ docker buildx build \
--platform "${PLATFORMS}" \ "${platform_args[@]}" \
-f "${dockerfile}" \ -f "${dockerfile}" \
-t "${image}:${IMAGE_TAG}" \ -t "${image}:${IMAGE_TAG}" \
-t "${image}:latest" \ -t "${image}:latest" \
--push \ --push \
"${ROOT_DIR}" "${ROOT_DIR}"
else else
# buildx cannot `--load` a manifest list, so load the host platform only.
local host_platform
host_platform="$(docker version --format '{{.Server.Os}}/{{.Server.Arch}}' 2>/dev/null || echo linux/amd64)"
platform_args=(--platform "${host_platform}")
docker buildx build \ docker buildx build \
--platform "${PLATFORMS}" \ "${platform_args[@]}" \
-f "${dockerfile}" \ -f "${dockerfile}" \
-t "${image}:${IMAGE_TAG}" \ -t "${image}:${IMAGE_TAG}" \
-t "${image}:latest" \ -t "${image}:latest" \