From b79e69fc6956ccbe5dfda0aa15ac775dd6394ecb Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 18:36:47 +0200 Subject: [PATCH 01/12] Enable vaapi --- templates/.Dockerfile-env.swp | Bin 0 -> 1024 bytes templates/Dockerfile-run | 1 + templates/Dockerfile-template.alpine | 1 + templates/Dockerfile-template.centos | 1 + templates/Dockerfile-template.scratch | 1 + templates/Dockerfile-template.ubuntu | 1 + 6 files changed, 5 insertions(+) create mode 100644 templates/.Dockerfile-env.swp diff --git a/templates/.Dockerfile-env.swp b/templates/.Dockerfile-env.swp new file mode 100644 index 0000000000000000000000000000000000000000..e6721d542b9b8e772d47c6c8dce5a73b2ea40705 GIT binary patch literal 1024 zcmYc?$V<%2S1{5u)iY*50x=p43~9-UMLC(NMM%O}nWagkc_pP-rBDP*QgaJ(5=&Bx f^ /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ diff --git a/templates/Dockerfile-template.scratch b/templates/Dockerfile-template.scratch index a1666a966..39b84c4e6 100644 --- a/templates/Dockerfile-template.scratch +++ b/templates/Dockerfile-template.scratch @@ -35,6 +35,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index 4943c41b8..100fce4bd 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -41,6 +41,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} From 9d3dccf44dfa750ab947f63bf4375b35c73087f1 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 18:36:53 +0200 Subject: [PATCH 02/12] Regenerate images --- docker-images/2.8/alpine/Dockerfile | 2 ++ docker-images/2.8/centos/Dockerfile | 2 ++ docker-images/2.8/scratch/Dockerfile | 2 ++ docker-images/2.8/ubuntu/Dockerfile | 2 ++ docker-images/3.0/alpine/Dockerfile | 2 ++ docker-images/3.0/centos/Dockerfile | 2 ++ docker-images/3.0/scratch/Dockerfile | 2 ++ docker-images/3.0/ubuntu/Dockerfile | 2 ++ docker-images/3.1/alpine/Dockerfile | 2 ++ docker-images/3.1/centos/Dockerfile | 2 ++ docker-images/3.1/scratch/Dockerfile | 2 ++ docker-images/3.1/ubuntu/Dockerfile | 2 ++ docker-images/3.2/alpine/Dockerfile | 2 ++ docker-images/3.2/centos/Dockerfile | 2 ++ docker-images/3.2/scratch/Dockerfile | 2 ++ docker-images/3.2/ubuntu/Dockerfile | 2 ++ docker-images/3.3/alpine/Dockerfile | 2 ++ docker-images/3.3/centos/Dockerfile | 2 ++ docker-images/3.3/scratch/Dockerfile | 2 ++ docker-images/3.3/ubuntu/Dockerfile | 2 ++ docker-images/3.4/alpine/Dockerfile | 2 ++ docker-images/3.4/centos/Dockerfile | 2 ++ docker-images/3.4/scratch/Dockerfile | 2 ++ docker-images/3.4/ubuntu/Dockerfile | 2 ++ docker-images/4.0/alpine/Dockerfile | 2 ++ docker-images/4.0/centos/Dockerfile | 2 ++ docker-images/4.0/scratch/Dockerfile | 2 ++ docker-images/4.0/ubuntu/Dockerfile | 2 ++ docker-images/snapshot/alpine/Dockerfile | 2 ++ docker-images/snapshot/centos/Dockerfile | 2 ++ docker-images/snapshot/scratch/Dockerfile | 2 ++ docker-images/snapshot/ubuntu/Dockerfile | 2 ++ 32 files changed, 64 insertions(+) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 4e4d02168..9741fd56f 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index 0cfbb5d67..aa52f0615 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/2.8/scratch/Dockerfile b/docker-images/2.8/scratch/Dockerfile index ea17d35b1..e51e8c8a0 100644 --- a/docker-images/2.8/scratch/Dockerfile +++ b/docker-images/2.8/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 8ea9c20e2..907502d75 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 68eacc64f..7ba708110 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index cd3d151fc..b6eda24f0 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.0/scratch/Dockerfile b/docker-images/3.0/scratch/Dockerfile index 756fee635..b8fc89d03 100644 --- a/docker-images/3.0/scratch/Dockerfile +++ b/docker-images/3.0/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index dd89d623b..dbd189661 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index 986d5f074..f3de2b0d6 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index ca2675358..107e5f4d3 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.1/scratch/Dockerfile b/docker-images/3.1/scratch/Dockerfile index f03c682b7..a14b6b6be 100644 --- a/docker-images/3.1/scratch/Dockerfile +++ b/docker-images/3.1/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 7338262b7..6023ffc29 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.2/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index d333c0ca9..bcfe54cf8 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.2/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index f4b8709cc..929da0039 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.2/scratch/Dockerfile b/docker-images/3.2/scratch/Dockerfile index ed5680a0f..d9a2d83b2 100644 --- a/docker-images/3.2/scratch/Dockerfile +++ b/docker-images/3.2/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 1760dc9ea..a924e11ee 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.3/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 10de91d02..4ce509cef 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.3/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 5bd0f6134..422b6a0fe 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.3/scratch/Dockerfile b/docker-images/3.3/scratch/Dockerfile index f4d3fa77d..533d0de1a 100644 --- a/docker-images/3.3/scratch/Dockerfile +++ b/docker-images/3.3/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 0734a7027..f7a20ba89 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 6194b8006..12de120ac 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index f71b075b4..00ea7ac0b 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.4/scratch/Dockerfile b/docker-images/3.4/scratch/Dockerfile index 5ae499089..0846efa96 100644 --- a/docker-images/3.4/scratch/Dockerfile +++ b/docker-images/3.4/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 1e3b8cabc..c8c60c4be 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index d709c20a5..7aa5d5286 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index a1f5a264a..aaa581085 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/4.0/scratch/Dockerfile b/docker-images/4.0/scratch/Dockerfile index 367838c64..2dc3a3e63 100644 --- a/docker-images/4.0/scratch/Dockerfile +++ b/docker-images/4.0/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 332ebf0ab..89e2cf6f2 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index 37220cc5d..d004d7714 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -71,6 +71,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ zlib-dev \ + libva-dev \ expat-dev" && \ apk add --no-cache --update ${buildDeps} ## opencore-amr https://sourceforge.net/projects/opencore-amr/ @@ -340,6 +341,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 35c9ea71c..9a891bb71 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -70,6 +70,7 @@ RUN buildDeps="autoconf \ tar \ yasm \ which \ + libva-devel \ zlib-devel" && \ echo "${SRC}/lib" > /etc/ld.so.conf.d/libc.conf && \ yum --enablerepo=extras install -y epel-release && \ @@ -341,6 +342,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/snapshot/scratch/Dockerfile b/docker-images/snapshot/scratch/Dockerfile index 62ebc15a0..91d7f8a34 100644 --- a/docker-images/snapshot/scratch/Dockerfile +++ b/docker-images/snapshot/scratch/Dockerfile @@ -66,6 +66,7 @@ RUN buildDeps="autoconf \ openssl-dev \ tar \ yasm \ + libva-dev \ zlib-dev" && \ apk add --update ${buildDeps} libgcc libstdc++ ca-certificates libcrypto1.0 libssl1.0 @@ -336,6 +337,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index f6a52faeb..9e0144c7e 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -72,6 +72,7 @@ RUN buildDeps="autoconf \ python \ libssl-dev \ yasm \ + libva-dev \ zlib1g-dev" && \ apt-get -yqq update && \ apt-get install -yq --no-install-recommends ${buildDeps} @@ -342,6 +343,7 @@ RUN \ --enable-postproc \ --enable-small \ --enable-version3 \ + --enable-vaapi \ --extra-cflags="-I${PREFIX}/include" \ --extra-ldflags="-L${PREFIX}/lib" \ --extra-libs=-ldl \ From b0b474a17eae3920ccfe88f098d15d7ab94ed7f4 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 19:06:08 +0200 Subject: [PATCH 03/12] Install libva-drm1 in Ubuntu --- templates/Dockerfile-template.ubuntu | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index 100fce4bd..b3600e9fc 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -62,5 +62,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From a41d7777dc72b38832afcc041e6524690a69f2d7 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 19:06:19 +0200 Subject: [PATCH 04/12] Update Ubuntu images --- docker-images/2.8/ubuntu/Dockerfile | 5 +++++ docker-images/3.0/ubuntu/Dockerfile | 5 +++++ docker-images/3.1/ubuntu/Dockerfile | 5 +++++ docker-images/3.2/ubuntu/Dockerfile | 5 +++++ docker-images/3.3/ubuntu/Dockerfile | 5 +++++ docker-images/3.4/ubuntu/Dockerfile | 5 +++++ docker-images/4.0/ubuntu/Dockerfile | 5 +++++ docker-images/snapshot/ubuntu/Dockerfile | 5 +++++ 8 files changed, 40 insertions(+) diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 907502d75..13cd6fd03 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index dbd189661..d457a51d8 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 6023ffc29..4494ab601 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index a924e11ee..13b418d85 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index f7a20ba89..895ca4c88 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index c8c60c4be..fb07688ea 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 89e2cf6f2..48e2333db 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # 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/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index 9e0144c7e..cf6bc3f94 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -372,5 +372,10 @@ ENV LD_LIBRARY_PATH=/usr/local/lib COPY --from=build /usr/local /usr/local/ +RUN \ + apt-get update -y && \ + apt-get install -y libva-drm1 && \ + rm -rf /var/lib/apt/lists/* + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 34d052c8c65ded983c9c957ed987ec8a4fac51db Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 19:27:13 +0200 Subject: [PATCH 05/12] Add libva --- templates/Dockerfile-template.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index b3600e9fc..198a8ba50 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -64,7 +64,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly From caded4e5c3f727b029c00f68d7da6356a208f41d Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 7 Jun 2018 19:27:22 +0200 Subject: [PATCH 06/12] Regenerate Ubuntu images --- docker-images/2.8/ubuntu/Dockerfile | 2 +- docker-images/3.0/ubuntu/Dockerfile | 2 +- docker-images/3.1/ubuntu/Dockerfile | 2 +- docker-images/3.2/ubuntu/Dockerfile | 2 +- docker-images/3.3/ubuntu/Dockerfile | 2 +- docker-images/3.4/ubuntu/Dockerfile | 2 +- docker-images/4.0/ubuntu/Dockerfile | 2 +- docker-images/snapshot/ubuntu/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 13cd6fd03..20044be24 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index d457a51d8..f232cf8cd 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 4494ab601..4296699c8 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 13b418d85..731f0f847 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 895ca4c88..846b9f608 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index fb07688ea..12a62f7b2 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 48e2333db..6c5d68f62 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index cf6bc3f94..d0d3d18e4 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 && \ + apt-get install -y libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly From 8797ff17b85d1e0f03a7aa100a7568d73c02edf5 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Fri, 8 Jun 2018 09:31:48 +0200 Subject: [PATCH 07/12] CentOS: Install libva --- templates/Dockerfile-template.centos | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/templates/Dockerfile-template.centos b/templates/Dockerfile-template.centos index 882b74a64..acd5c234b 100644 --- a/templates/Dockerfile-template.centos +++ b/templates/Dockerfile-template.centos @@ -61,5 +61,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + rm -rf /var/cache/yum + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 3e8fe674a7c4d832089cf0213bbff9117a185d84 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Fri, 8 Jun 2018 09:32:00 +0200 Subject: [PATCH 08/12] Regenerate with CentOS containers with libva --- docker-images/2.8/centos/Dockerfile | 4 ++++ docker-images/3.0/centos/Dockerfile | 4 ++++ docker-images/3.1/centos/Dockerfile | 4 ++++ docker-images/3.2/centos/Dockerfile | 4 ++++ docker-images/3.3/centos/Dockerfile | 4 ++++ docker-images/3.4/centos/Dockerfile | 4 ++++ docker-images/4.0/centos/Dockerfile | 4 ++++ docker-images/snapshot/centos/Dockerfile | 4 ++++ 8 files changed, 32 insertions(+) diff --git a/docker-images/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index aa52f0615..d0c9f6835 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index b6eda24f0..0447f06f8 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index 107e5f4d3..2e26196c2 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 929da0039..047aede57 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 422b6a0fe..1efb53b52 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index 00ea7ac0b..cef2d601d 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index aaa581085..04d60f981 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # 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/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 9a891bb71..6820c7303 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -371,5 +371,9 @@ ENV LD_LIBRARY_PATH=/usr/local/lib64 COPY --from=build /usr/local/ /usr/local/ +RUN \ + yum install -y libva && \ + yum clean all + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 8ad2a89202e207e2d2ebe82f108afb988a38e7d6 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Fri, 8 Jun 2018 09:33:21 +0200 Subject: [PATCH 09/12] Install libva in Alpine --- templates/Dockerfile-template.alpine | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/Dockerfile-template.alpine b/templates/Dockerfile-template.alpine index 1fa036384..841b6ec2f 100644 --- a/templates/Dockerfile-template.alpine +++ b/templates/Dockerfile-template.alpine @@ -60,5 +60,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From bd03d7bc94767fc611969771af8aecbd5e7b1266 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Fri, 8 Jun 2018 09:33:31 +0200 Subject: [PATCH 10/12] Regenerate Alpine containers with libva --- docker-images/2.8/alpine/Dockerfile | 3 +++ docker-images/2.8/centos/Dockerfile | 2 +- docker-images/3.0/alpine/Dockerfile | 3 +++ docker-images/3.0/centos/Dockerfile | 2 +- docker-images/3.1/alpine/Dockerfile | 3 +++ docker-images/3.1/centos/Dockerfile | 2 +- docker-images/3.2/alpine/Dockerfile | 3 +++ docker-images/3.2/centos/Dockerfile | 2 +- docker-images/3.3/alpine/Dockerfile | 3 +++ docker-images/3.3/centos/Dockerfile | 2 +- docker-images/3.4/alpine/Dockerfile | 3 +++ docker-images/3.4/centos/Dockerfile | 2 +- docker-images/4.0/alpine/Dockerfile | 3 +++ docker-images/4.0/centos/Dockerfile | 2 +- docker-images/snapshot/alpine/Dockerfile | 3 +++ docker-images/snapshot/centos/Dockerfile | 2 +- 16 files changed, 32 insertions(+), 8 deletions(-) diff --git a/docker-images/2.8/alpine/Dockerfile b/docker-images/2.8/alpine/Dockerfile index 9741fd56f..e782f219c 100644 --- a/docker-images/2.8/alpine/Dockerfile +++ b/docker-images/2.8/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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/2.8/centos/Dockerfile b/docker-images/2.8/centos/Dockerfile index d0c9f6835..b0276d654 100644 --- a/docker-images/2.8/centos/Dockerfile +++ b/docker-images/2.8/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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.0/alpine/Dockerfile b/docker-images/3.0/alpine/Dockerfile index 7ba708110..c398f6fbf 100644 --- a/docker-images/3.0/alpine/Dockerfile +++ b/docker-images/3.0/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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.0/centos/Dockerfile b/docker-images/3.0/centos/Dockerfile index 0447f06f8..bee8eb1e1 100644 --- a/docker-images/3.0/centos/Dockerfile +++ b/docker-images/3.0/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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.1/alpine/Dockerfile b/docker-images/3.1/alpine/Dockerfile index f3de2b0d6..4f0dd4309 100644 --- a/docker-images/3.1/alpine/Dockerfile +++ b/docker-images/3.1/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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.1/centos/Dockerfile b/docker-images/3.1/centos/Dockerfile index 2e26196c2..df25b3ca1 100644 --- a/docker-images/3.1/centos/Dockerfile +++ b/docker-images/3.1/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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/alpine/Dockerfile b/docker-images/3.2/alpine/Dockerfile index bcfe54cf8..34eb25b93 100644 --- a/docker-images/3.2/alpine/Dockerfile +++ b/docker-images/3.2/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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/centos/Dockerfile b/docker-images/3.2/centos/Dockerfile index 047aede57..301908644 100644 --- a/docker-images/3.2/centos/Dockerfile +++ b/docker-images/3.2/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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/alpine/Dockerfile b/docker-images/3.3/alpine/Dockerfile index 4ce509cef..e2abdfd9b 100644 --- a/docker-images/3.3/alpine/Dockerfile +++ b/docker-images/3.3/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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/centos/Dockerfile b/docker-images/3.3/centos/Dockerfile index 1efb53b52..095c14db5 100644 --- a/docker-images/3.3/centos/Dockerfile +++ b/docker-images/3.3/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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.4/alpine/Dockerfile b/docker-images/3.4/alpine/Dockerfile index 12de120ac..6080bf9d5 100644 --- a/docker-images/3.4/alpine/Dockerfile +++ b/docker-images/3.4/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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.4/centos/Dockerfile b/docker-images/3.4/centos/Dockerfile index cef2d601d..3fcafa71d 100644 --- a/docker-images/3.4/centos/Dockerfile +++ b/docker-images/3.4/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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/4.0/alpine/Dockerfile b/docker-images/4.0/alpine/Dockerfile index 7aa5d5286..463cab199 100644 --- a/docker-images/4.0/alpine/Dockerfile +++ b/docker-images/4.0/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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/4.0/centos/Dockerfile b/docker-images/4.0/centos/Dockerfile index 04d60f981..3de13e888 100644 --- a/docker-images/4.0/centos/Dockerfile +++ b/docker-images/4.0/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # 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/snapshot/alpine/Dockerfile b/docker-images/snapshot/alpine/Dockerfile index d004d7714..4a898a8c2 100644 --- a/docker-images/snapshot/alpine/Dockerfile +++ b/docker-images/snapshot/alpine/Dockerfile @@ -370,5 +370,8 @@ ENTRYPOINT ["ffmpeg"] COPY --from=build /usr/local /usr/local +RUN \ + apk add --no-cache --update libva + # 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/snapshot/centos/Dockerfile b/docker-images/snapshot/centos/Dockerfile index 6820c7303..90f670177 100644 --- a/docker-images/snapshot/centos/Dockerfile +++ b/docker-images/snapshot/centos/Dockerfile @@ -373,7 +373,7 @@ COPY --from=build /usr/local/ /usr/local/ RUN \ yum install -y libva && \ - yum clean all + rm -rf /var/cache/yum # Let's make sure the app built correctly # Convenient to verify on https://hub.docker.com/r/jrottenberg/ffmpeg/builds/ console output From 1255104b585700c6391bea7924595f61d1932f90 Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 14 Jun 2018 10:47:57 +0200 Subject: [PATCH 11/12] Don't install recommended packages --- templates/Dockerfile-template.ubuntu | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/Dockerfile-template.ubuntu b/templates/Dockerfile-template.ubuntu index 198a8ba50..01c481191 100644 --- a/templates/Dockerfile-template.ubuntu +++ b/templates/Dockerfile-template.ubuntu @@ -64,7 +64,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly From 696e40c871a565f7d2f0f44aea9c77f84385009e Mon Sep 17 00:00:00 2001 From: Frederik Carlier Date: Thu, 14 Jun 2018 10:48:03 +0200 Subject: [PATCH 12/12] Regenerate --- docker-images/2.8/ubuntu/Dockerfile | 2 +- docker-images/3.0/ubuntu/Dockerfile | 2 +- docker-images/3.1/ubuntu/Dockerfile | 2 +- docker-images/3.2/ubuntu/Dockerfile | 2 +- docker-images/3.3/ubuntu/Dockerfile | 2 +- docker-images/3.4/ubuntu/Dockerfile | 2 +- docker-images/4.0/ubuntu/Dockerfile | 2 +- docker-images/snapshot/ubuntu/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docker-images/2.8/ubuntu/Dockerfile b/docker-images/2.8/ubuntu/Dockerfile index 20044be24..c0da560cd 100644 --- a/docker-images/2.8/ubuntu/Dockerfile +++ b/docker-images/2.8/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.0/ubuntu/Dockerfile b/docker-images/3.0/ubuntu/Dockerfile index f232cf8cd..12824e922 100644 --- a/docker-images/3.0/ubuntu/Dockerfile +++ b/docker-images/3.0/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.1/ubuntu/Dockerfile b/docker-images/3.1/ubuntu/Dockerfile index 4296699c8..eb739048b 100644 --- a/docker-images/3.1/ubuntu/Dockerfile +++ b/docker-images/3.1/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.2/ubuntu/Dockerfile b/docker-images/3.2/ubuntu/Dockerfile index 731f0f847..0bb2de3b3 100644 --- a/docker-images/3.2/ubuntu/Dockerfile +++ b/docker-images/3.2/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.3/ubuntu/Dockerfile b/docker-images/3.3/ubuntu/Dockerfile index 846b9f608..154a445cf 100644 --- a/docker-images/3.3/ubuntu/Dockerfile +++ b/docker-images/3.3/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/3.4/ubuntu/Dockerfile b/docker-images/3.4/ubuntu/Dockerfile index 12a62f7b2..c463a8cfc 100644 --- a/docker-images/3.4/ubuntu/Dockerfile +++ b/docker-images/3.4/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/4.0/ubuntu/Dockerfile b/docker-images/4.0/ubuntu/Dockerfile index 6c5d68f62..ff8a63602 100644 --- a/docker-images/4.0/ubuntu/Dockerfile +++ b/docker-images/4.0/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly diff --git a/docker-images/snapshot/ubuntu/Dockerfile b/docker-images/snapshot/ubuntu/Dockerfile index d0d3d18e4..5a7fde70f 100644 --- a/docker-images/snapshot/ubuntu/Dockerfile +++ b/docker-images/snapshot/ubuntu/Dockerfile @@ -374,7 +374,7 @@ COPY --from=build /usr/local /usr/local/ RUN \ apt-get update -y && \ - apt-get install -y libva-drm1 libva1 && \ + apt-get install -y --no-install-recommends libva-drm1 libva1 && \ rm -rf /var/lib/apt/lists/* # Let's make sure the app built correctly