From cdb92b9dbc6023f4c5214fbfccacacdd0382a9ca Mon Sep 17 00:00:00 2001
From: thelamer <ryankuba@gmail.com>
Date: Sat, 22 Jun 2019 08:17:59 -0700
Subject: [PATCH] rebasing cli to ubuntu

---
 Dockerfile         | 33 ++++++++++++++++++++-------------
 Dockerfile.aarch64 | 27 +++++++++++++++++----------
 Dockerfile.armhf   | 27 +++++++++++++++++----------
 3 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index a0b0571..daef222 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 FROM lsiobase/ffmpeg:bin as binstage
-FROM lsiobase/alpine:3.9
+FROM lsiobase/ubuntu:bionic
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -12,21 +12,28 @@ LABEL maintainer="thelamer"
 
 # hardware env
 ENV \
- LIBVA_DRIVERS_PATH="/usr/lib/dri" \
+ LIBVA_DRIVERS_PATH="/usr/lib/x86_64-linux-gnu/dri" \
  NVIDIA_DRIVER_CAPABILITIES="compute,video,utility"
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	libgomp \
-	libpng \
-	libxext \
-	libva-intel-driver \
-	libxml2 \
-	mesa-dri-ati \
-	mesa-dri-nouveau \
-	mesa-vulkan-ati \
-	v4l-utils-libs
+ echo "**** install runtime ****" && \
+ apt-get update && \
+ apt-get install -y \
+	i965-va-driver \
+	libexpat1 \
+	libgl1-mesa-dri \
+	libglib2.0-0 \
+	libgomp1 \
+	libharfbuzz0b \
+	libv4l-0 \
+	libx11-6 \
+	libxcb1 \
+	libxext6 \
+	libxml2 && \
+ echo "**** clean up ****" && \
+ rm -rf \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 COPY /root /
 
diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
index 0f8bb2f..2faf7a9 100644
--- a/Dockerfile.aarch64
+++ b/Dockerfile.aarch64
@@ -1,5 +1,5 @@
 FROM lsiobase/ffmpeg:arm64v8-bin as binstage
-FROM lsiobase/alpine:arm64v8-3.9
+FROM lsiobase/ubuntu:arm64v8-bionic
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -11,15 +11,22 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	expat \
-	libgomp \
-	libpng \
-	libstdc++ \
-	libxext \
-	libxml2 \
-	v4l-utils-libs
+ echo "**** install runtime ****" && \
+ apt-get update && \
+ apt-get install -y \
+	libexpat1 \
+	libglib2.0-0 \
+	libgomp1 \
+	libharfbuzz0b \
+	libv4l-0 \
+	libx11-6 \
+	libxcb1 \
+	libxext6 \
+	libxml2 && \
+ echo "**** clean up ****" && \
+ rm -rf \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 COPY /root /
 
diff --git a/Dockerfile.armhf b/Dockerfile.armhf
index 98e7e12..187807c 100644
--- a/Dockerfile.armhf
+++ b/Dockerfile.armhf
@@ -1,5 +1,5 @@
 FROM lsiobase/ffmpeg:arm32v7-bin as binstage
-FROM lsiobase/alpine:arm32v7-3.9
+FROM lsiobase/ubuntu:arm32v7-bionic
 
 # Add files from binstage
 COPY --from=binstage / /
@@ -11,15 +11,22 @@ LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DA
 LABEL maintainer="thelamer"
 
 RUN \
- echo "**** install packages ****" && \
- apk add --no-cache \
-	expat \
-	libgomp \
-	libpng \
-	libstdc++ \
-	libxext \
-	libxml2 \
-	v4l-utils-libs
+ echo "**** install runtime ****" && \
+ apt-get update && \
+ apt-get install -y \
+	libexpat1 \
+	libglib2.0-0 \
+	libgomp1 \
+	libharfbuzz0b \
+	libv4l-0 \
+	libx11-6 \
+	libxcb1 \
+	libxext6 \
+	libxml2 && \
+ echo "**** clean up ****" && \
+ rm -rf \
+	/var/lib/apt/lists/* \
+	/var/tmp/*
 
 COPY /root /