more image rename

livekit · Jan 12, 2024 · c3b05e4 · c3b05e4
1 parent e0a046e
commit c3b05e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/build/gstreamer/Dockerfile-dev b/build/gstreamer/Dockerfile-dev
@@ -1,6 +1,6 @@
 ARG GSTREAMER_VERSION
 
-FROM livekit/gstreamer:${GSTREAMER_VERSION}-base
+FROM livekit/gstreamer:${GSTREAMER_VERSION}-base-${TARGETARCH}
 
 ENV DEBUG=true
 ENV OPTIMIZATIONS=false

diff --git a/build/gstreamer/Dockerfile-prod b/build/gstreamer/Dockerfile-prod
@@ -1,6 +1,6 @@
 ARG GSTREAMER_VERSION
 
-FROM livekit/gstreamer:${GSTREAMER_VERSION}-base
+FROM livekit/gstreamer:${GSTREAMER_VERSION}-base-${TARGETARCH}
 
 ENV DEBUG=false
 ENV OPTIMIZATIONS=true

diff --git a/build/gstreamer/Dockerfile-prod-rs b/build/gstreamer/Dockerfile-prod-rs
@@ -1,8 +1,8 @@
 ARG GSTREAMER_VERSION
 
-FROM livekit/gstreamer:${GSTREAMER_VERSION}-base
+FROM livekit/gstreamer:${GSTREAMER_VERSION}-base-${TARGETARCH}
 
-FROM livekit/gstreamer:${GSTREAMER_VERSION}-dev
+FROM livekit/gstreamer:${GSTREAMER_VERSION}-dev-${TARGETARCH}
 
 COPY --from=0 /gst-plugins-rs /gst-plugins-rs
 
@@ -14,6 +14,6 @@ COPY compile-rs /
 
 RUN /compile-rs 
 
-FROM livekit/gstreamer:${GSTREAMER_VERSION}-prod
+FROM livekit/gstreamer:${GSTREAMER_VERSION}-prod-${TARGETARCH}
 
 COPY --from=1 /compiled-binaries /
diff --git a/magefile.go b/magefile.go
@@ -22,6 +22,7 @@ import (
 	"fmt"
 	"os"
 	"path"
+	"runtime"
 	"strings"
 
 	"github.com/livekit/mageutil"
@@ -165,9 +166,10 @@ func buildGstreamer(cmd string) error {
 			" --build-arg GSTREAMER_VERSION=%s"+
 			" --build-arg LIBNICE_VERSION=%s"+
 			" -t livekit/gstreamer:%s-%s"+
+			" -t livekit/gstreamer:%s-%s-%s"+
 			" -f build/gstreamer/Dockerfile-%s"+
 			" ./build/gstreamer",
-			cmd, gstVersion, libniceVersion, gstVersion, build, build,
+			cmd, gstVersion, libniceVersion, gstVersion, build, gstVersion, build, runtime.GOARCH, build,
 		))
 	}