Skip to content

Commit 2cfd48a

Browse files
committed
rebase again to fix ffmpeg issue
1 parent 69e3a4f commit 2cfd48a

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM binhex/arch-base:2018100901
1+
FROM binhex/arch-base:2018101001
22
MAINTAINER binhex
33

44
# additional files

build/root/install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ mv /tmp/scripts-master/shell/arch/docker/*.sh /root/
1919
####
2020

2121
# define pacman packages
22-
pacman_packages="git wget libx264 libvpx"
22+
pacman_packages="git wget ffmpeg"
2323

2424
# install compiled packages using pacman
2525
if [[ ! -z "${pacman_packages}" ]]; then
@@ -39,7 +39,7 @@ source /root/aor.sh
3939
####
4040

4141
# define aur packages
42-
aur_packages="ffmpeg-headless comskip tvheadend"
42+
aur_packages="comskip tvheadend"
4343

4444
# call aur install script (arch user repo)
4545
source /root/aur.sh

0 commit comments

Comments
 (0)