From feae9222c6639999e80e0854c8804b30a5984379 Mon Sep 17 00:00:00 2001
From: aler9 <46489434+aler9@users.noreply.github.com>
Date: Mon, 12 Dec 2022 14:37:22 +0100
Subject: [PATCH] add latest-rpi docker image

---
 README.md            |  4 ++--
 scripts/dockerhub.mk | 12 ++++++++++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 67fbcfc6..b20dcf90 100644
--- a/README.md
+++ b/README.md
@@ -562,7 +562,7 @@ If you want to run the standard (non-containerized) version of the server:
        source: rpiCamera
    ```
 
-If you want to run the server with Docker, you need to use the `latest-arm64-rpi` or `latest-armv7-rpi` or `latest-armv6-rpi` image (that already contains libcamera) and set some additional flags:
+If you want to run the server with Docker, you need to use the `latest-rpi` image (that already contains libcamera) and set some additional flags:
 
 ```
 docker run --rm -it \
@@ -571,7 +571,7 @@ docker run --rm -it \
 --tmpfs /dev/shm:exec \
 -v /run/udev:/run/udev:ro \
 -e RTSP_PATHS_CAM_SOURCE=rpiCamera \
-aler9/rtsp-simple-server:latest-arm64-rpi
+aler9/rtsp-simple-server:latest-rpi
 ```
 
 After starting the server, the camera can be reached on `rtsp://raspberry-pi:8554/cam` or `http://raspberry-pi:8888/cam`.
diff --git a/scripts/dockerhub.mk b/scripts/dockerhub.mk
index 7f64513f..7821378b 100644
--- a/scripts/dockerhub.mk
+++ b/scripts/dockerhub.mk
@@ -7,7 +7,7 @@ endef
 export DOCKERFILE_DOCKERHUB
 
 define DOCKERFILE_DOCKERHUB_RPI_32
-FROM $(RPI32_IMAGE)
+FROM --platform=linux/amd64 $(RPI32_IMAGE)
 RUN ["cross-build-start"]
 RUN apt update && apt install -y --no-install-recommends libcamera0
 RUN ["cross-build-end"]
@@ -18,7 +18,7 @@ endef
 export DOCKERFILE_DOCKERHUB_RPI_32
 
 define DOCKERFILE_DOCKERHUB_RPI_64
-FROM $(RPI64_IMAGE)
+FROM --platform=linux/amd64 $(RPI64_IMAGE)
 RUN ["cross-build-start"]
 RUN apt update && apt install -y --no-install-recommends libcamera0
 RUN ["cross-build-end"]
@@ -87,10 +87,18 @@ dockerhub:
 	-t aler9/rtsp-simple-server:latest-arm64v8-rpi \
 	--push
 
+	docker manifest create aler9/rtsp-simple-server:$(VERSION)-rpi \
+	$(foreach ARCH,armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH)-rpi)
+	docker manifest push aler9/rtsp-simple-server:$(VERSION)-rpi
+
 	docker manifest create aler9/rtsp-simple-server:$(VERSION) \
 	$(foreach ARCH,amd64 armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH))
 	docker manifest push aler9/rtsp-simple-server:$(VERSION)
 
+	docker manifest create aler9/rtsp-simple-server:latest-rpi \
+	$(foreach ARCH,armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH)-rpi)
+	docker manifest push aler9/rtsp-simple-server:latest-rpi
+
 	docker manifest create aler9/rtsp-simple-server:latest \
 	$(foreach ARCH,amd64 armv6 armv7 arm64v8,aler9/rtsp-simple-server:$(VERSION)-$(ARCH))
 	docker manifest push aler9/rtsp-simple-server:latest