From 94fae92e9a8a2987fbe0a1dc3b8cb0b57fb5b9f0 Mon Sep 17 00:00:00 2001
From: Yassine Doghri <yassine@doghri.fr>
Date: Wed, 14 Sep 2022 14:45:39 +0000
Subject: [PATCH] build(docker): extract ffmpeg tar directly into the ffmpeg
folder
This fixes a bug where the mv ffmpeg command breaks if the upstream folder name of the ffmpeg tar
changes (version change).
---
docker/production/app/Dockerfile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/docker/production/app/Dockerfile b/docker/production/app/Dockerfile
index f764a3f9a3..ff2b0a7110 100644
--- a/docker/production/app/Dockerfile
+++ b/docker/production/app/Dockerfile
@@ -2,8 +2,8 @@ FROM docker.io/alpine:3.13 AS ffmpeg-downloader
RUN apk add --no-cache curl && \
curl https://johnvansickle.com/ffmpeg/releases/ffmpeg-release-amd64-static.tar.xz -o ffmpeg.tar.xz && \
- tar -xJf ffmpeg.tar.xz && \
- mv ffmpeg-5.0.1-amd64-static ffmpeg
+ mkdir ffmpeg && \
+ tar -xJf ffmpeg.tar.xz -C ffmpeg --strip-components 1
FROM docker.io/php:8.0-fpm-alpine3.13
--
GitLab