Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[docker] re-add ffmpeg which got lost in the switch of base images #1327

Merged
merged 1 commit into from
Dec 10, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
# Install base packages
# Things which all stages (build, test, run) need
FROM unit:php8.3 AS base
COPY --from=mwader/static-ffmpeg:7.1 /ffmpeg /ffprobe /usr/local/bin/
RUN apt update && \
apt upgrade -y && \
apt install -y --no-install-recommends \
Expand All @@ -26,7 +27,6 @@ RUN docker-php-ext-install mysqli pgsql pdo pdo_mysql pdo_pgsql zip pcntl
# dependencies, so let's avoid including that in the final image
FROM base AS dev-tools
COPY --from=composer:latest /usr/bin/composer /usr/local/bin/composer
# php8.3-xdebug
RUN apt update && apt upgrade -y && \
apt install -y git procps net-tools vim && \
rm -rf /var/lib/apt/lists/*
Expand Down