Use single multi-arch Dockerfile

plexinc · Jun 22, 2023 · 83062cd · 83062cd
1 parent c5da1c4
commit 83062cd
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 241 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,14 +1,34 @@
-FROM ubuntu:22.04
-
+FROM ubuntu:22.04 as base-amd64
 ARG S6_OVERLAY_VERSION=v3.1.5.0
 ARG S6_OVERLAY_ARCH=x86_64
 ARG PLEX_BUILD=linux-x86_64
 ARG PLEX_DISTRO=debian
-ARG DEBIAN_FRONTEND="noninteractive"
 ARG INTEL_NEO_VERSION=20.48.18558
 ARG INTEL_IGC_VERSION=1.0.5699
 ARG INTEL_GMMLIB_VERSION=20.3.2
 
+FROM arm64v8/ubuntu:22.04 as base-arm64
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=aarch64
+ARG PLEX_BUILD=linux-aarch64
+
+FROM arm32v7/ubuntu:22.04 as base-arm
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=arm
+ARG PLEX_BUILD=linux-armv7hf_neon
+
+FROM i386/ubuntu:18.04 as base-386
+ARG S6_OVERLAY_VERSION=v3.1.5.0
+ARG S6_OVERLAY_ARCH=i686
+ARG PLEX_BUILD=linux-x86
+
+FROM base-${TARGETARCH} AS plex
+ARG TARGETARCH
+RUN echo Building pms-docker for ${TARGETARCH}
+
+ARG DEBIAN_FRONTEND="noninteractive"
+ARG PLEX_DISTRO=debian
+
 RUN \
 # Update and get dependencies
     apt-get update && \

diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
diff --git a/Dockerfile.armv7 b/Dockerfile.armv7
diff --git a/Dockerfile.i386 b/Dockerfile.i386
diff --git a/dev/build.386.sh b/dev/build.386.sh
@@ -4,4 +4,4 @@ IFS=$'\n\t'
 
 # This is just a helper script to quickly test local Dockerfile builds, please run setup-build-env.sh once
 
-docker buildx build -o type=docker,name=pms-386 --load --platform linux/386 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile.i386 ..
+docker buildx build --progress=plain -o type=docker,name=pms-386 --load --platform linux/386 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
diff --git a/dev/build.amd64.sh b/dev/build.amd64.sh
@@ -5,4 +5,4 @@ IFS=$'\n\t'
 # This is just a helper script to quickly test local Dockerfile builds, please run setup-build-env.sh once
 
 # https://github.com/tianon/docker-brew-ubuntu-core/issues/183 explains why need to use --security-opt seccomp:unconfined
-docker buildx build --security-opt seccomp:unconfined -o type=docker,name=pms-amd64 --platform linux/amd64 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
+docker buildx build --progress=plain --security-opt seccomp:unconfined -o type=docker,name=pms-amd64 --platform linux/amd64 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
diff --git a/dev/build.arm32v7.sh b/dev/build.arm32v7.sh
@@ -5,4 +5,4 @@ IFS=$'\n\t'
 # This is just a helper script to quickly test local Dockerfile builds, please run setup-build-env.sh once
 
 # https://github.com/tianon/docker-brew-ubuntu-core/issues/183 explains why need to use --security-opt seccomp:unconfined
-docker buildx build --security-opt seccomp:unconfined -o type=docker,name=pms-armv7 --load --platform linux/arm/v7 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile.armv7 ..
+docker buildx build --progress=plain --security-opt seccomp:unconfined -o type=docker,name=pms-armv7 --load --platform linux/arm/v7 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
diff --git a/dev/build.arm64v8.sh b/dev/build.arm64v8.sh
@@ -5,4 +5,4 @@ IFS=$'\n\t'
 # This is just a helper script to quickly test local Dockerfile builds, please run setup-build-env.sh once
 
 # https://github.com/tianon/docker-brew-ubuntu-core/issues/183
-docker buildx build --security-opt seccomp:unconfined -o type=docker,name=pms-arm64 --load --platform linux/arm64 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile.arm64 ..
+docker buildx build --progress=plain --security-opt seccomp:unconfined -o type=docker,name=pms-arm64 --load --platform linux/arm64 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
diff --git a/dev/push.all.sh b/dev/push.all.sh
@@ -0,0 +1 @@
+docker buildx build --progress=plain --push --security-opt seccomp:unconfined  --platform linux/amd64,linux/386,linux/arm/v7,linux/arm64   --build-arg AUTOUPDATE=TRUE -f ../Dockerfile --tag INSERT_TAG_HERE:autoupdate ..
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@ IFS=$'\n\t'

		# This is just a helper script to quickly test local Dockerfile builds, please run setup-build-env.sh once

		docker buildx build -o type=docker,name=pms-386 --load --platform linux/386 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile.i386 ..
		docker buildx build --progress=plain -o type=docker,name=pms-386 --load --platform linux/386 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile ..
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		docker buildx build --progress=plain --push --security-opt seccomp:unconfined --platform linux/amd64,linux/386,linux/arm/v7,linux/arm64 --build-arg AUTOUPDATE=TRUE -f ../Dockerfile --tag INSERT_TAG_HERE:autoupdate ..