fix(docker): use latest ffmpeg

Darkness4 · Aug 14, 2023 · 8b33c08 · 8b33c08
1 parent 9227046
commit 8b33c08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Dockerfile.static-base b/Dockerfile.static-base
@@ -1,7 +1,7 @@
 FROM docker.io/gentoo/stage3:musl as builder
 
 RUN PORTAGE_RSYNC_EXTRA_OPTS="-q" emerge --sync
-RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" USE="static-libs -dav1d -encode -network -gpl -postproc -zlib -gnutls -bzip2 -opus" FFTOOLS="" emerge \
+RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" ACCEPT_KEYWORDS="~amd64" USE="static-libs -dav1d -encode -network -gpl -postproc -zlib -gnutls -bzip2 -opus" FFTOOLS="" emerge \
   media-video/ffmpeg
-RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" USE="gold" emerge sys-devel/binutils
-RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" ACCEPT_KEYWORDS="~amd64" emerge ">=dev-lang/go-1.21.0" dev-vcs/git
+RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" USE="gold" emerge sys-devel/binutils dev-vcs/git
+RUN --mount=type=cache,target=/var/tmp/portage MAKEOPTS="-j$(nproc)" ACCEPT_KEYWORDS="~amd64" emerge ">=dev-lang/go-1.21.0"
diff --git a/Makefile b/Makefile
@@ -483,7 +483,7 @@ docker-static-base:
 	podman manifest rm ghcr.io/darkness4/fc2-live-dl-go:latest-static-base || true
 	podman build \
 		--manifest ghcr.io/darkness4/fc2-live-dl-go:latest-static-base \
-		--jobs=2 --platform=linux/amd64,linux/arm64/v8 \
+		--platform=linux/amd64,linux/arm64/v8 \
 		-f Dockerfile.static-base .
 	podman manifest push --all --rm ghcr.io/darkness4/fc2-live-dl-go:latest-static-base "docker://ghcr.io/darkness4/fc2-live-dl-go:latest-static-base"