From ed9f80250359cddd9778377d9ab3f2c711530e9b Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Wed, 20 Jul 2022 10:05:19 +0100 Subject: [PATCH 1/3] Add 4.4 and 5.0 version rows and scratch/alpine313 columns to README --- README.md | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b377b7355..8e9fc2f9e 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ This image can be used as a base for an encoding farm. There are different builds available: - alpine based images `ffmpeg:-alpine` or `ffmpeg:-alpine313` (old versions with `ffmpeg:-alpine312` , `ffmpeg:-alpine311`) - - alpine based scratch images `ffmpeg:-scratch` or `ffmpeg:-scratch313` (old versions with `ffmpeg:-scratch312` , `ffmpeg:-scratch311`) +- alpine based scratch images `ffmpeg:-scratch` or `ffmpeg:-scratch313` (old versions with `ffmpeg:-scratch312` , `ffmpeg:-scratch311`) - centos based images `ffmpeg:-centos` or `ffmpeg:-centos7` or `ffmpeg:-centos8` - ubuntu based images `ffmpeg:-ubuntu` or `ffmpeg:-ubuntu2004` (old versions with `ffmpeg:-ubuntu1804` , `ffmpeg:-ubuntu1604`) - - ubuntu based nvidia images `ffmpeg:-nvidia` or `ffmpeg:-nvidia2004` (old versions with `ffmpeg:-nvidia1804`, `ffmpeg:-nvidia1604`) - - ubuntu based vaapi images `ffmpeg:-vaapi1804` or `ffmpeg:-vaapi2004` (old versions with `ffmpeg:-vaapi1804`, `ffmpeg:-nvidia1604`) +- ubuntu based nvidia images `ffmpeg:-nvidia` or `ffmpeg:-nvidia2004` (old versions with `ffmpeg:-nvidia1804`, `ffmpeg:-nvidia1604`) +- ubuntu based vaapi images `ffmpeg:-vaapi1804` or `ffmpeg:-vaapi2004` (old versions with `ffmpeg:-vaapi1804`, `ffmpeg:-nvidia1604`) `` can be one of the following: - 3.2 @@ -33,19 +33,22 @@ There are different builds available: - 4.2 - 4.3 - 4.4 +- 5.0 Not all combinations are supported and older versions will fade out over time. See the table below for the currently supported combinations. -| *Version* | alpine38 | alpine312 | centos7 | centos8 | nvidia1804 | scratch38 | scratch312 | ubuntu1804 | ubuntu2004 | vaapi1804 | vaapi2004 | -| ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | -| *3.2* | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *3.3* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *3.4* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.0* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.1* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.2* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.3* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| *snapshot* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *Version* | alpine38 | alpine312 | alpine313 | centos7 | centos8 | nvidia1804 | scratch38 | scratch312 | scratch313 | ubuntu1804 | ubuntu2004 | vaapi1804 | vaapi2004 | +| ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | +| *3.2* | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *3.3* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *3.4* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.0* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.1* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.2* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.3* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *4.4* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *5.0* | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *snapshot* | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | ### Generate list of recent images From 53b01540cadae3fc7efb799a1a2f7a0718f04fc1 Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Wed, 20 Jul 2022 10:08:10 +0100 Subject: [PATCH 2/3] Updated 3.2 version rows for scratch/alpine 3.13 as docker images exist --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8e9fc2f9e..1de3109f9 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ Not all combinations are supported and older versions will fade out over time. S | *Version* | alpine38 | alpine312 | alpine313 | centos7 | centos8 | nvidia1804 | scratch38 | scratch312 | scratch313 | ubuntu1804 | ubuntu2004 | vaapi1804 | vaapi2004 | | ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | -| *3.2* | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *3.2* | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | | *3.3* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | | *3.4* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | | *4.0* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | From 7ecbb18c0f85fb5f38a3a77abf81d47343d03a4b Mon Sep 17 00:00:00 2001 From: Rich Hodgkins Date: Wed, 20 Jul 2022 10:20:18 +0100 Subject: [PATCH 3/3] Updated alpine/scratch 3.13 to 3.16 --- README.md | 26 +- docker-images/3.2/alpine313/Dockerfile | 594 ------------------ docker-images/3.2/scratch313/Dockerfile | 591 ----------------- .../3.3/{alpine313 => alpine316}/Dockerfile | 2 +- .../3.3/{scratch313 => scratch316}/Dockerfile | 2 +- .../3.4/{alpine313 => alpine316}/Dockerfile | 2 +- .../3.4/{scratch313 => scratch316}/Dockerfile | 2 +- .../4.0/{alpine313 => alpine316}/Dockerfile | 2 +- .../4.0/{scratch313 => scratch316}/Dockerfile | 2 +- .../4.1/{alpine313 => alpine316}/Dockerfile | 2 +- .../4.1/{scratch313 => scratch316}/Dockerfile | 2 +- .../4.2/{alpine313 => alpine316}/Dockerfile | 2 +- .../4.2/{scratch313 => scratch316}/Dockerfile | 2 +- .../4.3/{alpine313 => alpine316}/Dockerfile | 2 +- .../4.3/{scratch313 => scratch316}/Dockerfile | 2 +- .../4.4/{alpine313 => alpine316}/Dockerfile | 2 +- .../4.4/{scratch313 => scratch316}/Dockerfile | 2 +- .../5.0/{alpine313 => alpine316}/Dockerfile | 2 +- .../5.0/{scratch313 => scratch316}/Dockerfile | 2 +- docker-images/azure-jobs.yml | 82 +-- docker-images/gitlab-ci.yml | 86 +-- ...lpine313 => Dockerfile-template.alpine316} | 2 +- ...atch313 => Dockerfile-template.scratch316} | 2 +- update.py | 8 +- 24 files changed, 99 insertions(+), 1324 deletions(-) delete mode 100644 docker-images/3.2/alpine313/Dockerfile delete mode 100644 docker-images/3.2/scratch313/Dockerfile rename docker-images/3.3/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/3.3/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/3.4/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/3.4/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/4.0/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/4.0/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/4.1/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/4.1/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/4.2/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/4.2/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/4.3/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/4.3/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/4.4/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/4.4/{scratch313 => scratch316}/Dockerfile (99%) rename docker-images/5.0/{alpine313 => alpine316}/Dockerfile (99%) rename docker-images/5.0/{scratch313 => scratch316}/Dockerfile (99%) rename templates/{Dockerfile-template.alpine313 => Dockerfile-template.alpine316} (98%) rename templates/{Dockerfile-template.scratch313 => Dockerfile-template.scratch316} (98%) diff --git a/README.md b/README.md index 1de3109f9..22a4285bd 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ This image can be used as a base for an encoding farm. ## Builds There are different builds available: -- alpine based images `ffmpeg:-alpine` or `ffmpeg:-alpine313` (old versions with `ffmpeg:-alpine312` , `ffmpeg:-alpine311`) +- alpine based images `ffmpeg:-alpine` or `ffmpeg:-alpine316` (old versions with `ffmpeg:-alpine313` , `ffmpeg:-alpine312` , `ffmpeg:-alpine311`) - alpine based scratch images `ffmpeg:-scratch` or `ffmpeg:-scratch313` (old versions with `ffmpeg:-scratch312` , `ffmpeg:-scratch311`) - centos based images `ffmpeg:-centos` or `ffmpeg:-centos7` or `ffmpeg:-centos8` - ubuntu based images `ffmpeg:-ubuntu` or `ffmpeg:-ubuntu2004` (old versions with `ffmpeg:-ubuntu1804` , `ffmpeg:-ubuntu1604`) @@ -37,18 +37,18 @@ There are different builds available: Not all combinations are supported and older versions will fade out over time. See the table below for the currently supported combinations. -| *Version* | alpine38 | alpine312 | alpine313 | centos7 | centos8 | nvidia1804 | scratch38 | scratch312 | scratch313 | ubuntu1804 | ubuntu2004 | vaapi1804 | vaapi2004 | -| ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | -| *3.2* | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *3.3* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *3.4* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.0* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.1* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.2* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | -| *4.3* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| *4.4* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| *5.0* | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | -| *snapshot* | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *Version* | alpine38 | alpine312 | alpine313 | alpine316 | centos7 | centos8 | nvidia1804 | scratch38 | scratch312 | scratch313 | scratch316 | ubuntu1804 | ubuntu2004 | vaapi1804 | vaapi2004 | +| ---------- | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | ------------------ | +| *3.2* | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *3.3* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *3.4* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.0* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.1* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.2* | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | +| *4.3* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *4.4* | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *5.0* | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | +| *snapshot* | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | :x: | :x: | :heavy_check_mark: | :heavy_check_mark: | :x: | :heavy_check_mark: | ### Generate list of recent images diff --git a/docker-images/3.2/alpine313/Dockerfile b/docker-images/3.2/alpine313/Dockerfile deleted file mode 100644 index 315ffa6d1..000000000 --- a/docker-images/3.2/alpine313/Dockerfile +++ /dev/null @@ -1,594 +0,0 @@ -# ffmpeg - http://ffmpeg.org/download.html -# -# https://hub.docker.com/r/jrottenberg/ffmpeg/ -# -# - -FROM alpine:3.13 AS base - -RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git - - -FROM base AS build - -WORKDIR /tmp/workdir - -ENV FFMPEG_VERSION=3.2.18 \ - AOM_VERSION=v1.0.0 \ - CHROMAPRINT_VERSION=1.5.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.12 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local - -ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" -ARG LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz" -ARG LIBARIBB24_SHA256SUM="f61560738926e57f9173510389634d8c06cabedfa857db4b28fb7704707ff128 v1.0.3.tar.gz" - - -ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib -ARG MAKEFLAGS="-j2" -ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig" -ARG PREFIX=/opt/ffmpeg -ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64" - - -RUN buildDeps="autoconf \ - automake \ - bash \ - binutils \ - bzip2 \ - cmake \ - coreutils \ - curl \ - diffutils \ - expat-dev \ - file \ - g++ \ - gcc \ - gperf \ - libtool \ - make \ - nasm \ - openssl-dev \ - python3 \ - tar \ - xcb-proto \ - yasm \ - zlib-dev" && \ - apk add --no-cache --update ${buildDeps} -## libvmaf https://github.com/Netflix/vmaf -RUN \ - if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ - else \ - echo "VMAF skipped."; \ - fi - -## opencore-amr https://sourceforge.net/projects/opencore-amr/ -RUN \ - DIR=/tmp/opencore-amr && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz/download | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## x264 http://www.videolan.org/developers/x264.html -RUN \ - DIR=/tmp/x264 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ - tar -jx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ - make install && \ - rm -rf ${DIR} -### x265 http://x265.org/ -RUN \ - DIR=/tmp/x265 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/videolan/x265/archive/refs/tags/${X265_VERSION}.tar.gz | \ - tar -zx && \ - cd x265-${X265_VERSION}/build/linux && \ - sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ - sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ - ./multilib.sh && \ - make -C 8bit install && \ - rm -rf ${DIR} -### libogg https://www.xiph.org/ogg/ -RUN \ - DIR=/tmp/ogg && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ - echo ${OGG_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libopus https://www.opus-codec.org/ -RUN \ - DIR=/tmp/opus && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ - echo ${OPUS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ - autoreconf -fiv && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libvorbis https://xiph.org/vorbis/ -RUN \ - DIR=/tmp/vorbis && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ - echo ${VORBIS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libtheora http://www.theora.org/ -RUN \ - DIR=/tmp/theora && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ - echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libvpx https://www.webmproject.org/code/ -RUN \ - DIR=/tmp/vpx && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ - --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ - make install && \ - rm -rf ${DIR} -### libwebp https://developers.google.com/speed/webp/ -RUN \ - DIR=/tmp/vebp && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libmp3lame http://lame.sourceforge.net/ -RUN \ - DIR=/tmp/lame && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://sourceforge.net/projects/lame/files/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz/download | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ - make install && \ - rm -rf ${DIR} -### xvid https://www.xvid.com/ -RUN \ - DIR=/tmp/xvid && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ - echo ${XVID_SHA256SUM} | sha256sum --check && \ - tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ - cd xvidcore/build/generic && \ - ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ - make install && \ - rm -rf ${DIR} -### fdk-aac https://github.com/mstorsjo/fdk-aac -RUN \ - DIR=/tmp/fdk-aac && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - autoreconf -fiv && \ - ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ - make install && \ - rm -rf ${DIR} -## openjpeg https://github.com/uclouvain/openjpeg -RUN \ - DIR=/tmp/openjpeg && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} -## freetype https://www.freetype.org/ -RUN \ - DIR=/tmp/freetype && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ - echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libvstab https://github.com/georgmartius/vid.stab -RUN \ - DIR=/tmp/vid.stab && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz && \ - echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} -## fridibi https://www.fribidi.org/ -RUN \ - DIR=/tmp/fribidi && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ - echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ - sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib bin/' Makefile.am && \ - ./bootstrap --no-config --auto && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j1 && \ - make install && \ - rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## kvazaar https://github.com/ultravideo/kvazaar -RUN \ - DIR=/tmp/kvazaar && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/aom && \ - git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ - cd ${DIR} ; \ - rm -rf CMakeCache.txt CMakeFiles ; \ - mkdir -p ./aom_build ; \ - cd ./aom_build ; \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ - make install ; \ - rm -rf ${DIR} - -## libxcb (and supporting libraries) for screen capture https://xcb.freedesktop.org/ -RUN \ - DIR=/tmp/xorg-macros && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/xproto && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libXau && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libpthread-stubs && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libxcb-proto && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ - ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libxcb && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/libxcb-${LIBXCB_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ - ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/GNOME/libxml2/archive/refs/tags/v${LIBXML2_VERSION}.tar.gz | \ - tar -xz --strip-components=1 && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libzmq https://github.com/zeromq/libzmq/ -RUN \ - DIR=/tmp/libzmq && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/zeromq/libzmq/archive/v${LIBZMQ_VERSION}.tar.gz && \ - echo ${LIBZMQ_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make check && \ - make install && \ - rm -rf ${DIR} - -## libsrt https://github.com/Haivision/srt -RUN \ - DIR=/tmp/srt && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libpng -RUN \ - DIR=/tmp/png && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make check && \ - make install && \ - rm -rf ${DIR} - -## libaribb24 -RUN \ - DIR=/tmp/b24 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/nkoriyama/aribb24/archive/v${LIBARIBB24_VERSION}.tar.gz && \ - echo ${LIBARIBB24_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ - autoreconf -fiv && \ - ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -## Download ffmpeg https://ffmpeg.org/ -RUN \ - DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ - curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ - ./configure --disable-debug --disable-doc --disable-ffplay --enable-shared --enable-gpl --extra-libs=-ldl && \ - make ; make install - - - - - -## Build ffmpeg https://ffmpeg.org/ -RUN \ - DIR=/tmp/ffmpeg && cd ${DIR} && \ - ./configure \ - --disable-debug \ - --disable-doc \ - --disable-ffplay \ - --enable-avresample \ - --enable-fontconfig \ - --enable-gpl \ - --enable-libass \ - --enable-libbluray \ - --enable-libfdk_aac \ - --enable-libfreetype \ - --enable-libkvazaar \ - --enable-libmp3lame \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libtheora \ - --enable-libvidstab \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxcb \ - --enable-libxvid \ - --enable-libzmq \ - --enable-nonfree \ - --enable-openssl \ - --enable-postproc \ - --enable-shared \ - --enable-small \ - --enable-version3 \ - --extra-cflags="-I${PREFIX}/include" \ - --extra-ldflags="-L${PREFIX}/lib" \ - --extra-libs=-ldl \ - --prefix="${PREFIX}" && \ - make clean && \ - make && \ - make install && \ - make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ - make distclean && \ - hash -r && \ - cd tools && \ - make qt-faststart && cp qt-faststart ${PREFIX}/bin/ - - -RUN \ - ldd ${PREFIX}/bin/ffmpeg | grep opt/ffmpeg | cut -d ' ' -f 3 | xargs -i cp {} /usr/local/lib/ && \ - for lib in /usr/local/lib/*.so.*; do ln -s "${lib##*/}" "${lib%%.so.*}".so; done && \ - cp ${PREFIX}/bin/* /usr/local/bin/ && \ - cp -r ${PREFIX}/share/ffmpeg /usr/local/share/ && \ - LD_LIBRARY_PATH=/usr/local/lib ffmpeg -buildconf && \ - mkdir -p /usr/local/include && \ - cp -r ${PREFIX}/include/libav* ${PREFIX}/include/libpostproc ${PREFIX}/include/libsw* /usr/local/include && \ - mkdir -p /usr/local/lib/pkgconfig && \ - for pc in ${PREFIX}/lib/pkgconfig/libav*.pc ${PREFIX}/lib/pkgconfig/libpostproc.pc ${PREFIX}/lib/pkgconfig/libsw*.pc; do \ - sed "s:${PREFIX}:/usr/local:g" <"$pc" >/usr/local/lib/pkgconfig/"${pc##*/}"; \ - done - -### Release Stage -FROM base AS release -LABEL org.opencontainers.image.authors="julien@rottenberg.info" \ - org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg - -ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 - -CMD ["--help"] -ENTRYPOINT ["ffmpeg"] - -COPY --from=build /usr/local /usr/local - -# Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.2/scratch313/Dockerfile b/docker-images/3.2/scratch313/Dockerfile deleted file mode 100644 index cd00693cd..000000000 --- a/docker-images/3.2/scratch313/Dockerfile +++ /dev/null @@ -1,591 +0,0 @@ -# ffmpeg - http://ffmpeg.org/download.html -# -# https://hub.docker.com/r/jrottenberg/ffmpeg/ -# -# - -FROM alpine:3.13 AS build - -WORKDIR /tmp/workdir - -ENV FFMPEG_VERSION=3.2.18 \ - AOM_VERSION=v1.0.0 \ - CHROMAPRINT_VERSION=1.5.0 \ - FDKAAC_VERSION=0.1.5 \ - FONTCONFIG_VERSION=2.12.4 \ - FREETYPE_VERSION=2.10.4 \ - FRIBIDI_VERSION=0.19.7 \ - KVAZAAR_VERSION=2.0.0 \ - LAME_VERSION=3.100 \ - LIBASS_VERSION=0.13.7 \ - LIBPTHREAD_STUBS_VERSION=0.4 \ - LIBVIDSTAB_VERSION=1.1.0 \ - LIBXCB_VERSION=1.13.1 \ - XCBPROTO_VERSION=1.13 \ - OGG_VERSION=1.3.2 \ - OPENCOREAMR_VERSION=0.1.5 \ - OPUS_VERSION=1.2 \ - OPENJPEG_VERSION=2.1.2 \ - THEORA_VERSION=1.1.1 \ - VORBIS_VERSION=1.3.5 \ - VPX_VERSION=1.8.0 \ - WEBP_VERSION=1.0.2 \ - X264_VERSION=20170226-2245-stable \ - X265_VERSION=3.4 \ - XAU_VERSION=1.0.9 \ - XORG_MACROS_VERSION=1.19.2 \ - XPROTO_VERSION=7.0.31 \ - XVID_VERSION=1.3.4 \ - LIBXML2_VERSION=2.9.12 \ - LIBBLURAY_VERSION=1.1.2 \ - LIBZMQ_VERSION=4.3.2 \ - LIBSRT_VERSION=1.4.1 \ - LIBARIBB24_VERSION=1.0.3 \ - LIBPNG_VERSION=1.6.9 \ - LIBVMAF_VERSION=2.1.1 \ - SRC=/usr/local - -ARG FREETYPE_SHA256SUM="5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac freetype-2.10.4.tar.gz" -ARG FRIBIDI_SHA256SUM="3fc96fa9473bd31dcb5500bdf1aa78b337ba13eb8c301e7c28923fea982453a8 0.19.7.tar.gz" -ARG LIBASS_SHA256SUM="8fadf294bf701300d4605e6f1d92929304187fca4b8d8a47889315526adbafd7 0.13.7.tar.gz" -ARG LIBVIDSTAB_SHA256SUM="14d2a053e56edad4f397be0cb3ef8eb1ec3150404ce99a426c4eb641861dc0bb v1.1.0.tar.gz" -ARG OGG_SHA256SUM="e19ee34711d7af328cb26287f4137e70630e7261b17cbe3cd41011d73a654692 libogg-1.3.2.tar.gz" -ARG OPUS_SHA256SUM="77db45a87b51578fbc49555ef1b10926179861d854eb2613207dc79d9ec0a9a9 opus-1.2.tar.gz" -ARG THEORA_SHA256SUM="40952956c47811928d1e7922cda3bc1f427eb75680c3c37249c91e949054916b libtheora-1.1.1.tar.gz" -ARG VORBIS_SHA256SUM="6efbcecdd3e5dfbf090341b485da9d176eb250d893e3eb378c428a2db38301ce libvorbis-1.3.5.tar.gz" -ARG XVID_SHA256SUM="4e9fd62728885855bc5007fe1be58df42e5e274497591fec37249e1052ae316f xvidcore-1.3.4.tar.gz" -ARG LIBBLURAY_SHA256SUM="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42 libbluray-1.1.2.tar.bz2" -ARG LIBZMQ_SHA256SUM="02ecc88466ae38cf2c8d79f09cfd2675ba299a439680b64ade733e26a349edeb v4.3.2.tar.gz" -ARG LIBARIBB24_SHA256SUM="f61560738926e57f9173510389634d8c06cabedfa857db4b28fb7704707ff128 v1.0.3.tar.gz" - - -ARG LD_LIBRARY_PATH=/opt/ffmpeg/lib -ARG MAKEFLAGS="-j2" -ARG PKG_CONFIG_PATH="/opt/ffmpeg/share/pkgconfig:/opt/ffmpeg/lib/pkgconfig:/opt/ffmpeg/lib64/pkgconfig" -ARG PREFIX=/opt/ffmpeg -ARG LD_LIBRARY_PATH="/opt/ffmpeg/lib:/opt/ffmpeg/lib64" - - -RUN buildDeps="autoconf \ - automake \ - bash \ - binutils \ - bzip2 \ - ca-certificates \ - cmake \ - coreutils \ - curl \ - diffutils \ - expat-dev \ - file \ - g++ \ - gcc \ - git \ - gperf \ - libcrypto1.1 \ - libgcc \ - libssl1.1 \ - libstdc++ \ - libtool \ - make \ - nasm \ - openssl-dev \ - python3 \ - tar \ - xcb-proto \ - yasm \ - zlib-dev" && \ - apk add --update ${buildDeps} - -## libvmaf https://github.com/Netflix/vmaf -RUN \ - if which meson || false; then \ - echo "Building VMAF." && \ - DIR=/tmp/vmaf && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Netflix/vmaf/archive/v${LIBVMAF_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBVMAF_VERSION}.tar.gz && \ - cd /tmp/vmaf/libvmaf && \ - meson build --buildtype release --prefix=${PREFIX} && \ - ninja -vC build && \ - ninja -vC build install && \ - mkdir -p ${PREFIX}/share/model/ && \ - cp -r /tmp/vmaf/model/* ${PREFIX}/share/model/ && \ - rm -rf ${DIR}; \ - else \ - echo "VMAF skipped."; \ - fi - -## opencore-amr https://sourceforge.net/projects/opencore-amr/ -RUN \ - DIR=/tmp/opencore-amr && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://sourceforge.net/projects/opencore-amr/files/opencore-amr/opencore-amr-${OPENCOREAMR_VERSION}.tar.gz/download | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## x264 http://www.videolan.org/developers/x264.html -RUN \ - DIR=/tmp/x264 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://download.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-${X264_VERSION}.tar.bz2 | \ - tar -jx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared --enable-pic --disable-cli && \ - make && \ - make install && \ - rm -rf ${DIR} -### x265 http://x265.org/ -RUN \ - DIR=/tmp/x265 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/videolan/x265/archive/refs/tags/${X265_VERSION}.tar.gz | \ - tar -zx && \ - cd x265-${X265_VERSION}/build/linux && \ - sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ - sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ - ./multilib.sh && \ - make -C 8bit install && \ - rm -rf ${DIR} -### libogg https://www.xiph.org/ogg/ -RUN \ - DIR=/tmp/ogg && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/ogg/libogg-${OGG_VERSION}.tar.gz && \ - echo ${OGG_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libogg-${OGG_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libopus https://www.opus-codec.org/ -RUN \ - DIR=/tmp/opus && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://archive.mozilla.org/pub/opus/opus-${OPUS_VERSION}.tar.gz && \ - echo ${OPUS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f opus-${OPUS_VERSION}.tar.gz && \ - autoreconf -fiv && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libvorbis https://xiph.org/vorbis/ -RUN \ - DIR=/tmp/vorbis && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/vorbis/libvorbis-${VORBIS_VERSION}.tar.gz && \ - echo ${VORBIS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libvorbis-${VORBIS_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libtheora http://www.theora.org/ -RUN \ - DIR=/tmp/theora && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.gz && \ - echo ${THEORA_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f libtheora-${THEORA_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --with-ogg="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libvpx https://www.webmproject.org/code/ -RUN \ - DIR=/tmp/vpx && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://codeload.github.com/webmproject/libvpx/tar.gz/v${VPX_VERSION} | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-vp8 --enable-vp9 --enable-vp9-highbitdepth --enable-pic --enable-shared \ - --disable-debug --disable-examples --disable-docs --disable-install-bins && \ - make && \ - make install && \ - rm -rf ${DIR} -### libwebp https://developers.google.com/speed/webp/ -RUN \ - DIR=/tmp/vebp && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://storage.googleapis.com/downloads.webmproject.org/releases/webp/libwebp-${WEBP_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -### libmp3lame http://lame.sourceforge.net/ -RUN \ - DIR=/tmp/lame && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://sourceforge.net/projects/lame/files/lame/${LAME_VERSION}/lame-${LAME_VERSION}.tar.gz/download | \ - tar -zx --strip-components=1 && \ - ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" --enable-shared --enable-nasm --disable-frontend && \ - make && \ - make install && \ - rm -rf ${DIR} -### xvid https://www.xvid.com/ -RUN \ - DIR=/tmp/xvid && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ - echo ${XVID_SHA256SUM} | sha256sum --check && \ - tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ - cd xvidcore/build/generic && \ - ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ - make && \ - make install && \ - rm -rf ${DIR} -### fdk-aac https://github.com/mstorsjo/fdk-aac -RUN \ - DIR=/tmp/fdk-aac && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/mstorsjo/fdk-aac/archive/v${FDKAAC_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - autoreconf -fiv && \ - ./configure --prefix="${PREFIX}" --enable-shared --datadir="${DIR}" && \ - make && \ - make install && \ - rm -rf ${DIR} -## openjpeg https://github.com/uclouvain/openjpeg -RUN \ - DIR=/tmp/openjpeg && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/uclouvain/openjpeg/archive/v${OPENJPEG_VERSION}.tar.gz | \ - tar -zx --strip-components=1 && \ - cmake -DBUILD_THIRDPARTY:BOOL=ON -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} -## freetype https://www.freetype.org/ -RUN \ - DIR=/tmp/freetype && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.savannah.gnu.org/releases/freetype/freetype-${FREETYPE_VERSION}.tar.gz && \ - echo ${FREETYPE_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f freetype-${FREETYPE_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libvstab https://github.com/georgmartius/vid.stab -RUN \ - DIR=/tmp/vid.stab && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/georgmartius/vid.stab/archive/v${LIBVIDSTAB_VERSION}.tar.gz && \ - echo ${LIBVIDSTAB_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f v${LIBVIDSTAB_VERSION}.tar.gz && \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} -## fridibi https://www.fribidi.org/ -RUN \ - DIR=/tmp/fribidi && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/fribidi/fribidi/archive/${FRIBIDI_VERSION}.tar.gz && \ - echo ${FRIBIDI_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${FRIBIDI_VERSION}.tar.gz && \ - sed -i 's/^SUBDIRS =.*/SUBDIRS=gen.tab charset lib bin/' Makefile.am && \ - ./bootstrap --no-config --auto && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make -j1 && \ - make install && \ - rm -rf ${DIR} -## fontconfig https://www.freedesktop.org/wiki/Software/fontconfig/ -RUN \ - DIR=/tmp/fontconfig && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.freedesktop.org/software/fontconfig/release/fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f fontconfig-${FONTCONFIG_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## libass https://github.com/libass/libass -RUN \ - DIR=/tmp/libass && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/libass/libass/archive/${LIBASS_VERSION}.tar.gz && \ - echo ${LIBASS_SHA256SUM} | sha256sum --check && \ - tar -zx --strip-components=1 -f ${LIBASS_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} -## kvazaar https://github.com/ultravideo/kvazaar -RUN \ - DIR=/tmp/kvazaar && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/ultravideo/kvazaar/archive/v${KVAZAAR_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f v${KVAZAAR_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/aom && \ - git clone --branch ${AOM_VERSION} --depth 1 https://aomedia.googlesource.com/aom ${DIR} ; \ - cd ${DIR} ; \ - rm -rf CMakeCache.txt CMakeFiles ; \ - mkdir -p ./aom_build ; \ - cd ./aom_build ; \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" -DBUILD_SHARED_LIBS=1 ..; \ - make ; \ - make install ; \ - rm -rf ${DIR} - -## libxcb (and supporting libraries) for screen capture https://xcb.freedesktop.org/ -RUN \ - DIR=/tmp/xorg-macros && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive//individual/util/util-macros-${XORG_MACROS_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f util-macros-${XORG_MACROS_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/xproto && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive/individual/proto/xproto-${XPROTO_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f xproto-${XPROTO_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libXau && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://www.x.org/archive/individual/lib/libXau-${XAU_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libXau-${XAU_VERSION}.tar.gz && \ - ./configure --srcdir=${DIR} --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libpthread-stubs && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libpthread-stubs-${LIBPTHREAD_STUBS_VERSION}.tar.gz && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libxcb-proto && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f xcb-proto-${XCBPROTO_VERSION}.tar.gz && \ - ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -RUN \ - DIR=/tmp/libxcb && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://xcb.freedesktop.org/dist/libxcb-${LIBXCB_VERSION}.tar.gz && \ - tar -zx --strip-components=1 -f libxcb-${LIBXCB_VERSION}.tar.gz && \ - ACLOCAL_PATH="${PREFIX}/share/aclocal" ./autogen.sh && \ - ./configure --prefix="${PREFIX}" --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libxml2 - for libbluray -RUN \ - DIR=/tmp/libxml2 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sL https://github.com/GNOME/libxml2/archive/refs/tags/v${LIBXML2_VERSION}.tar.gz | \ - tar -xz --strip-components=1 && \ - ./autogen.sh --prefix="${PREFIX}" --with-ftp=no --with-http=no --with-python=no && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libbluray - Requires libxml, freetype, and fontconfig -RUN \ - DIR=/tmp/libbluray && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://download.videolan.org/pub/videolan/libbluray/${LIBBLURAY_VERSION}/libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - echo ${LIBBLURAY_SHA256SUM} | sha256sum --check && \ - tar -jx --strip-components=1 -f libbluray-${LIBBLURAY_VERSION}.tar.bz2 && \ - ./configure --prefix="${PREFIX}" --disable-examples --disable-bdjava-jar --disable-static --enable-shared && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libzmq https://github.com/zeromq/libzmq/ -RUN \ - DIR=/tmp/libzmq && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/zeromq/libzmq/archive/v${LIBZMQ_VERSION}.tar.gz && \ - echo ${LIBZMQ_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f v${LIBZMQ_VERSION}.tar.gz && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make && \ - make check && \ - make install && \ - rm -rf ${DIR} - -## libsrt https://github.com/Haivision/srt -RUN \ - DIR=/tmp/srt && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/Haivision/srt/archive/v${LIBSRT_VERSION}.tar.gz && \ - tar -xz --strip-components=1 -f v${LIBSRT_VERSION}.tar.gz && \ - cmake -DCMAKE_INSTALL_PREFIX="${PREFIX}" . && \ - make && \ - make install && \ - rm -rf ${DIR} - -## libpng -RUN \ - DIR=/tmp/png && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - git clone https://git.code.sf.net/p/libpng/code ${DIR} -b v${LIBPNG_VERSION} --depth 1 && \ - ./autogen.sh && \ - ./configure --prefix="${PREFIX}" && \ - make check && \ - make install && \ - rm -rf ${DIR} - -## libaribb24 -RUN \ - DIR=/tmp/b24 && \ - mkdir -p ${DIR} && \ - cd ${DIR} && \ - curl -sLO https://github.com/nkoriyama/aribb24/archive/v${LIBARIBB24_VERSION}.tar.gz && \ - echo ${LIBARIBB24_SHA256SUM} | sha256sum --check && \ - tar -xz --strip-components=1 -f v${LIBARIBB24_VERSION}.tar.gz && \ - autoreconf -fiv && \ - ./configure CFLAGS="-I${PREFIX}/include -fPIC" --prefix="${PREFIX}" && \ - make && \ - make install && \ - rm -rf ${DIR} - -## Download ffmpeg https://ffmpeg.org/ -RUN \ - DIR=/tmp/ffmpeg && mkdir -p ${DIR} && cd ${DIR} && \ - curl -sLO https://ffmpeg.org/releases/ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ - tar -jx --strip-components=1 -f ffmpeg-${FFMPEG_VERSION}.tar.bz2 && \ - ./configure --disable-debug --disable-doc --disable-ffplay --enable-shared --enable-gpl --extra-libs=-ldl && \ - make ; make install - - - - - -## Build ffmpeg https://ffmpeg.org/ -RUN \ - DIR=/tmp/ffmpeg && cd ${DIR} && \ - ./configure \ - --disable-debug \ - --disable-doc \ - --disable-ffplay \ - --enable-avresample \ - --enable-fontconfig \ - --enable-gpl \ - --enable-libass \ - --enable-libbluray \ - --enable-libfdk_aac \ - --enable-libfreetype \ - --enable-libkvazaar \ - --enable-libmp3lame \ - --enable-libopencore-amrnb \ - --enable-libopencore-amrwb \ - --enable-libopenjpeg \ - --enable-libopus \ - --enable-libtheora \ - --enable-libvidstab \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libwebp \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libxcb \ - --enable-libxvid \ - --enable-libzmq \ - --enable-nonfree \ - --enable-openssl \ - --enable-postproc \ - --enable-shared \ - --enable-small \ - --enable-version3 \ - --extra-cflags="-I${PREFIX}/include" \ - --extra-ldflags="-L${PREFIX}/lib" \ - --extra-libs=-ldl \ - --prefix="${PREFIX}" && \ - make clean && \ - make && \ - make install && \ - make tools/zmqsend && cp tools/zmqsend ${PREFIX}/bin/ && \ - make distclean && \ - hash -r && \ - cd tools && \ - make qt-faststart && cp qt-faststart ${PREFIX}/bin/ - - -RUN \ - mkdir -p /tmp/fakeroot/lib && \ - ldd ${PREFIX}/bin/ffmpeg | cut -d ' ' -f 3 | strings | xargs -I R cp R /tmp/fakeroot/lib/ && \ - for lib in /tmp/fakeroot/lib/*; do strip --strip-all $lib; done && \ - cp -r ${PREFIX}/bin /tmp/fakeroot/bin/ && \ - cp -r ${PREFIX}/share/ffmpeg /tmp/fakeroot/share/ && \ - LD_LIBRARY_PATH=/tmp/fakeroot/lib /tmp/fakeroot/bin/ffmpeg -buildconf - -### Release Stage -FROM scratch AS release -LABEL org.opencontainers.image.authors="julien@rottenberg.info" \ - org.opencontainers.image.source=https://github.com/jrottenberg/ffmpeg - -ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 - -CMD ["--help"] -ENTRYPOINT ["/bin/ffmpeg"] - -COPY --from=build /tmp/fakeroot/ / - -# Let's make sure the app built correctly -# Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output diff --git a/docker-images/3.3/alpine313/Dockerfile b/docker-images/3.3/alpine316/Dockerfile similarity index 99% rename from docker-images/3.3/alpine313/Dockerfile rename to docker-images/3.3/alpine316/Dockerfile index 323b10a1a..2bd938c59 100644 --- a/docker-images/3.3/alpine313/Dockerfile +++ b/docker-images/3.3/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/3.3/scratch313/Dockerfile b/docker-images/3.3/scratch316/Dockerfile similarity index 99% rename from docker-images/3.3/scratch313/Dockerfile rename to docker-images/3.3/scratch316/Dockerfile index b8b821ae6..da8819024 100644 --- a/docker-images/3.3/scratch313/Dockerfile +++ b/docker-images/3.3/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/3.4/alpine313/Dockerfile b/docker-images/3.4/alpine316/Dockerfile similarity index 99% rename from docker-images/3.4/alpine313/Dockerfile rename to docker-images/3.4/alpine316/Dockerfile index 056e905b3..9277809e1 100644 --- a/docker-images/3.4/alpine313/Dockerfile +++ b/docker-images/3.4/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/3.4/scratch313/Dockerfile b/docker-images/3.4/scratch316/Dockerfile similarity index 99% rename from docker-images/3.4/scratch313/Dockerfile rename to docker-images/3.4/scratch316/Dockerfile index de3a47829..270e0150c 100644 --- a/docker-images/3.4/scratch313/Dockerfile +++ b/docker-images/3.4/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/4.0/alpine313/Dockerfile b/docker-images/4.0/alpine316/Dockerfile similarity index 99% rename from docker-images/4.0/alpine313/Dockerfile rename to docker-images/4.0/alpine316/Dockerfile index 16e510ac7..8e9d0a24a 100644 --- a/docker-images/4.0/alpine313/Dockerfile +++ b/docker-images/4.0/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/4.0/scratch313/Dockerfile b/docker-images/4.0/scratch316/Dockerfile similarity index 99% rename from docker-images/4.0/scratch313/Dockerfile rename to docker-images/4.0/scratch316/Dockerfile index 70f852381..c8e5d93e1 100644 --- a/docker-images/4.0/scratch313/Dockerfile +++ b/docker-images/4.0/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/4.1/alpine313/Dockerfile b/docker-images/4.1/alpine316/Dockerfile similarity index 99% rename from docker-images/4.1/alpine313/Dockerfile rename to docker-images/4.1/alpine316/Dockerfile index 2b0420570..46174973d 100644 --- a/docker-images/4.1/alpine313/Dockerfile +++ b/docker-images/4.1/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/4.1/scratch313/Dockerfile b/docker-images/4.1/scratch316/Dockerfile similarity index 99% rename from docker-images/4.1/scratch313/Dockerfile rename to docker-images/4.1/scratch316/Dockerfile index 4cf86c2ac..a1d8f4fa6 100644 --- a/docker-images/4.1/scratch313/Dockerfile +++ b/docker-images/4.1/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/4.2/alpine313/Dockerfile b/docker-images/4.2/alpine316/Dockerfile similarity index 99% rename from docker-images/4.2/alpine313/Dockerfile rename to docker-images/4.2/alpine316/Dockerfile index f626accfd..1652c6529 100644 --- a/docker-images/4.2/alpine313/Dockerfile +++ b/docker-images/4.2/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/4.2/scratch313/Dockerfile b/docker-images/4.2/scratch316/Dockerfile similarity index 99% rename from docker-images/4.2/scratch313/Dockerfile rename to docker-images/4.2/scratch316/Dockerfile index b5a836650..cc4be9b24 100644 --- a/docker-images/4.2/scratch313/Dockerfile +++ b/docker-images/4.2/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/4.3/alpine313/Dockerfile b/docker-images/4.3/alpine316/Dockerfile similarity index 99% rename from docker-images/4.3/alpine313/Dockerfile rename to docker-images/4.3/alpine316/Dockerfile index 5cb21c51f..f3c6634b3 100644 --- a/docker-images/4.3/alpine313/Dockerfile +++ b/docker-images/4.3/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/4.3/scratch313/Dockerfile b/docker-images/4.3/scratch316/Dockerfile similarity index 99% rename from docker-images/4.3/scratch313/Dockerfile rename to docker-images/4.3/scratch316/Dockerfile index 6e11f2164..be1a7da52 100644 --- a/docker-images/4.3/scratch313/Dockerfile +++ b/docker-images/4.3/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/4.4/alpine313/Dockerfile b/docker-images/4.4/alpine316/Dockerfile similarity index 99% rename from docker-images/4.4/alpine313/Dockerfile rename to docker-images/4.4/alpine316/Dockerfile index 348767a08..56353eeac 100644 --- a/docker-images/4.4/alpine313/Dockerfile +++ b/docker-images/4.4/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/4.4/scratch313/Dockerfile b/docker-images/4.4/scratch316/Dockerfile similarity index 99% rename from docker-images/4.4/scratch313/Dockerfile rename to docker-images/4.4/scratch316/Dockerfile index 2d2549829..b2e118fc9 100644 --- a/docker-images/4.4/scratch313/Dockerfile +++ b/docker-images/4.4/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/5.0/alpine313/Dockerfile b/docker-images/5.0/alpine316/Dockerfile similarity index 99% rename from docker-images/5.0/alpine313/Dockerfile rename to docker-images/5.0/alpine316/Dockerfile index 217f145ed..0e6ec7277 100644 --- a/docker-images/5.0/alpine313/Dockerfile +++ b/docker-images/5.0/alpine316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/docker-images/5.0/scratch313/Dockerfile b/docker-images/5.0/scratch316/Dockerfile similarity index 99% rename from docker-images/5.0/scratch313/Dockerfile rename to docker-images/5.0/scratch316/Dockerfile index 4790dafda..b5babeee8 100644 --- a/docker-images/5.0/scratch313/Dockerfile +++ b/docker-images/5.0/scratch316/Dockerfile @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/docker-images/azure-jobs.yml b/docker-images/azure-jobs.yml index b088c6e88..6554a7305 100644 --- a/docker-images/azure-jobs.yml +++ b/docker-images/azure-jobs.yml @@ -26,11 +26,11 @@ jobs: ISPARENT: True - alpine313_5.0.1: + alpine316_5.0.1: MAJOR_VERSION: 5 VERSION: 5.0 LONG_VERSION: 5.0.1 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -53,11 +53,11 @@ jobs: ISPARENT: True - scratch313_5.0.1: + scratch316_5.0.1: MAJOR_VERSION: 5 VERSION: 5.0 LONG_VERSION: 5.0.1 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -107,11 +107,11 @@ jobs: ISPARENT: True - alpine313_4.4.2: + alpine316_4.4.2: MAJOR_VERSION: 4 VERSION: 4.4 LONG_VERSION: 4.4.2 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -134,11 +134,11 @@ jobs: ISPARENT: True - scratch313_4.4.2: + scratch316_4.4.2: MAJOR_VERSION: 4 VERSION: 4.4 LONG_VERSION: 4.4.2 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -188,11 +188,11 @@ jobs: ISPARENT: True - alpine313_4.3.4: + alpine316_4.3.4: MAJOR_VERSION: 4 VERSION: 4.3 LONG_VERSION: 4.3.4 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -215,11 +215,11 @@ jobs: ISPARENT: True - scratch313_4.3.4: + scratch316_4.3.4: MAJOR_VERSION: 4 VERSION: 4.3 LONG_VERSION: 4.3.4 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -269,11 +269,11 @@ jobs: ISPARENT: True - alpine313_4.2.7: + alpine316_4.2.7: MAJOR_VERSION: 4 VERSION: 4.2 LONG_VERSION: 4.2.7 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -296,11 +296,11 @@ jobs: ISPARENT: True - scratch313_4.2.7: + scratch316_4.2.7: MAJOR_VERSION: 4 VERSION: 4.2 LONG_VERSION: 4.2.7 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -341,11 +341,11 @@ jobs: ISPARENT: True - alpine313_4.1.9: + alpine316_4.1.9: MAJOR_VERSION: 4 VERSION: 4.1 LONG_VERSION: 4.1.9 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -368,11 +368,11 @@ jobs: ISPARENT: True - scratch313_4.1.9: + scratch316_4.1.9: MAJOR_VERSION: 4 VERSION: 4.1 LONG_VERSION: 4.1.9 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -413,11 +413,11 @@ jobs: ISPARENT: True - alpine313_4.0.6: + alpine316_4.0.6: MAJOR_VERSION: 4 VERSION: 4.0 LONG_VERSION: 4.0.6 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -440,11 +440,11 @@ jobs: ISPARENT: True - scratch313_4.0.6: + scratch316_4.0.6: MAJOR_VERSION: 4 VERSION: 4.0 LONG_VERSION: 4.0.6 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -485,11 +485,11 @@ jobs: ISPARENT: True - alpine313_3.4.11: + alpine316_3.4.11: MAJOR_VERSION: 3 VERSION: 3.4 LONG_VERSION: 3.4.11 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -512,11 +512,11 @@ jobs: ISPARENT: True - scratch313_3.4.11: + scratch316_3.4.11: MAJOR_VERSION: 3 VERSION: 3.4 LONG_VERSION: 3.4.11 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -557,11 +557,11 @@ jobs: ISPARENT: True - alpine313_3.3.9: + alpine316_3.3.9: MAJOR_VERSION: 3 VERSION: 3.3 LONG_VERSION: 3.3.9 - VARIANT: alpine313 + VARIANT: alpine316 PARENT: alpine ISPARENT: True @@ -584,11 +584,11 @@ jobs: ISPARENT: True - scratch313_3.3.9: + scratch316_3.3.9: MAJOR_VERSION: 3 VERSION: 3.3 LONG_VERSION: 3.3.9 - VARIANT: scratch313 + VARIANT: scratch316 PARENT: scratch ISPARENT: True @@ -620,15 +620,6 @@ jobs: ISPARENT: True - alpine313_3.2.18: - MAJOR_VERSION: 3 - VERSION: 3.2 - LONG_VERSION: 3.2.18 - VARIANT: alpine313 - PARENT: alpine - ISPARENT: True - - centos7_3.2.18: MAJOR_VERSION: 3 VERSION: 3.2 @@ -638,15 +629,6 @@ jobs: ISPARENT: True - scratch313_3.2.18: - MAJOR_VERSION: 3 - VERSION: 3.2 - LONG_VERSION: 3.2.18 - VARIANT: scratch313 - PARENT: scratch - ISPARENT: True - - vaapi2004_3.2.18: MAJOR_VERSION: 3 VERSION: 3.2 diff --git a/docker-images/gitlab-ci.yml b/docker-images/gitlab-ci.yml index aa665f293..95877be0e 100644 --- a/docker-images/gitlab-ci.yml +++ b/docker-images/gitlab-ci.yml @@ -29,14 +29,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -5.0.1-alpine313: +5.0.1-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 5 VERSION: "5.0" LONG_VERSION: "5.0.1" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -62,14 +62,14 @@ stages: PARENT: "centos" ISPARENT: "True" -5.0.1-scratch313: +5.0.1-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 5 VERSION: "5.0" LONG_VERSION: "5.0.1" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -128,14 +128,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -4.4.2-alpine313: +4.4.2-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 4 VERSION: "4.4" LONG_VERSION: "4.4.2" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -161,14 +161,14 @@ stages: PARENT: "centos" ISPARENT: "True" -4.4.2-scratch313: +4.4.2-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 4 VERSION: "4.4" LONG_VERSION: "4.4.2" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -227,14 +227,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -4.3.4-alpine313: +4.3.4-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 4 VERSION: "4.3" LONG_VERSION: "4.3.4" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -260,14 +260,14 @@ stages: PARENT: "centos" ISPARENT: "True" -4.3.4-scratch313: +4.3.4-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 4 VERSION: "4.3" LONG_VERSION: "4.3.4" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -326,14 +326,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -4.2.7-alpine313: +4.2.7-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 4 VERSION: "4.2" LONG_VERSION: "4.2.7" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -359,14 +359,14 @@ stages: PARENT: "centos" ISPARENT: "True" -4.2.7-scratch313: +4.2.7-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 4 VERSION: "4.2" LONG_VERSION: "4.2.7" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -414,14 +414,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -4.1.9-alpine313: +4.1.9-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 4 VERSION: "4.1" LONG_VERSION: "4.1.9" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -447,14 +447,14 @@ stages: PARENT: "centos" ISPARENT: "True" -4.1.9-scratch313: +4.1.9-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 4 VERSION: "4.1" LONG_VERSION: "4.1.9" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -502,14 +502,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -4.0.6-alpine313: +4.0.6-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 4 VERSION: "4.0" LONG_VERSION: "4.0.6" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -535,14 +535,14 @@ stages: PARENT: "centos" ISPARENT: "True" -4.0.6-scratch313: +4.0.6-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 4 VERSION: "4.0" LONG_VERSION: "4.0.6" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -590,14 +590,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -3.4.11-alpine313: +3.4.11-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 3 VERSION: "3.4" LONG_VERSION: "3.4.11" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -623,14 +623,14 @@ stages: PARENT: "centos" ISPARENT: "True" -3.4.11-scratch313: +3.4.11-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 3 VERSION: "3.4" LONG_VERSION: "3.4.11" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -678,14 +678,14 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -3.3.9-alpine313: +3.3.9-alpine316: extends: .docker stage: alpine variables: MAJOR_VERSION: 3 VERSION: "3.3" LONG_VERSION: "3.3.9" - VARIANT: alpine313 + VARIANT: alpine316 PARENT: "alpine" ISPARENT: "True" @@ -711,14 +711,14 @@ stages: PARENT: "centos" ISPARENT: "True" -3.3.9-scratch313: +3.3.9-scratch316: extends: .docker stage: scratch variables: MAJOR_VERSION: 3 VERSION: "3.3" LONG_VERSION: "3.3.9" - VARIANT: scratch313 + VARIANT: scratch316 PARENT: "scratch" ISPARENT: "True" @@ -755,17 +755,6 @@ stages: PARENT: "ubuntu" ISPARENT: "True" -3.2.18-alpine313: - extends: .docker - stage: alpine - variables: - MAJOR_VERSION: 3 - VERSION: "3.2" - LONG_VERSION: "3.2.18" - VARIANT: alpine313 - PARENT: "alpine" - ISPARENT: "True" - 3.2.18-centos7: extends: .docker stage: centos @@ -777,17 +766,6 @@ stages: PARENT: "centos" ISPARENT: "True" -3.2.18-scratch313: - extends: .docker - stage: scratch - variables: - MAJOR_VERSION: 3 - VERSION: "3.2" - LONG_VERSION: "3.2.18" - VARIANT: scratch313 - PARENT: "scratch" - ISPARENT: "True" - 3.2.18-vaapi2004: extends: .docker stage: vaapi diff --git a/templates/Dockerfile-template.alpine313 b/templates/Dockerfile-template.alpine316 similarity index 98% rename from templates/Dockerfile-template.alpine313 rename to templates/Dockerfile-template.alpine316 index 2635c114b..0e47caaa3 100644 --- a/templates/Dockerfile-template.alpine313 +++ b/templates/Dockerfile-template.alpine316 @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS base +FROM alpine:3.16 AS base RUN apk add --no-cache --update libgcc libstdc++ ca-certificates libcrypto1.1 libssl1.1 libgomp expat git diff --git a/templates/Dockerfile-template.scratch313 b/templates/Dockerfile-template.scratch316 similarity index 98% rename from templates/Dockerfile-template.scratch313 rename to templates/Dockerfile-template.scratch316 index 733f28e99..bdf5b868d 100644 --- a/templates/Dockerfile-template.scratch313 +++ b/templates/Dockerfile-template.scratch316 @@ -4,7 +4,7 @@ # # -FROM alpine:3.13 AS build +FROM alpine:3.16 AS build WORKDIR /tmp/workdir diff --git a/update.py b/update.py index 87388bebe..cda783371 100755 --- a/update.py +++ b/update.py @@ -21,10 +21,10 @@ VARIANTS = [ {"name": "ubuntu1804", "parent": "ubuntu"}, {"name": "ubuntu2004", "parent": "ubuntu"}, - {"name": "alpine313", "parent": "alpine"}, + {"name": "alpine316", "parent": "alpine"}, {"name": "centos7", "parent": "centos"}, {"name": "centos8", "parent": "centos"}, - {"name": "scratch313", "parent": "scratch"}, + {"name": "scratch316", "parent": "scratch"}, {"name": "vaapi1804", "parent": "vaapi"}, {"name": "vaapi2004", "parent": "vaapi"}, {"name": "nvidia2004", "parent": "nvidia"}, @@ -53,10 +53,10 @@ SKIP_VARIANTS = { "3.2": [ - "alpine312", + "alpine316", "centos8", "nvidia2004", - "scratch312", + "scratch316", "ubuntu1804", "vaapi1804", ],