Skip to content

Commit

Permalink
rebasing cli to ubuntu
Browse files Browse the repository at this point in the history
  • Loading branch information
thelamer committed Jun 22, 2019
1 parent 1ee3d7e commit cdb92b9
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 33 deletions.
33 changes: 20 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 / /
Expand All @@ -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 /

Expand Down
27 changes: 17 additions & 10 deletions Dockerfile.aarch64
Original file line number Diff line number Diff line change
@@ -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 / /
Expand All @@ -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 /

Expand Down
27 changes: 17 additions & 10 deletions Dockerfile.armhf
Original file line number Diff line number Diff line change
@@ -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 / /
Expand All @@ -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 /

Expand Down

0 comments on commit cdb92b9

Please sign in to comment.