Updated ARM containers to use Focal

This commit is contained in:
Graham Booker 2020-10-16 10:35:40 -05:00
parent 69b8aec45a
commit 15d3987c5a
No known key found for this signature in database
GPG Key ID: F023F35DADC3343C
2 changed files with 14 additions and 12 deletions

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:20.04
ARG S6_OVERLAY_VERSION=v1.22.1.0 ARG S6_OVERLAY_VERSION=v1.22.1.0
ARG S6_OVERLAY_ARCH=aarch64 ARG S6_OVERLAY_ARCH=aarch64
@ -19,22 +19,23 @@ RUN \
uuid-runtime \ uuid-runtime \
unrar \ unrar \
&& \ && \
\
# Fetch and extract S6 overlay # Fetch and extract S6 overlay
curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \ curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \
tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / && \ tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / --exclude='./bin' && \
tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C /usr ./bin && \
\
# Add user # Add user
useradd -U -d /config -s /bin/false plex && \ useradd -U -d /config -s /bin/false plex && \
usermod -G users plex && \ usermod -G users plex && \
\
# Setup directories # Setup directories
mkdir -p \ mkdir -p \
/config \ /config \
/transcode \ /transcode \
/data \ /data \
&& \ && \
\
# Cleanup # Cleanup
apt-get -y autoremove && \ apt-get -y autoremove && \
apt-get -y clean && \ apt-get -y clean && \

View File

@ -1,4 +1,4 @@
FROM ubuntu:16.04 FROM ubuntu:20.04
ARG S6_OVERLAY_VERSION=v1.22.1.0 ARG S6_OVERLAY_VERSION=v1.22.1.0
ARG S6_OVERLAY_ARCH=armhf ARG S6_OVERLAY_ARCH=armhf
@ -19,22 +19,23 @@ RUN \
uuid-runtime \ uuid-runtime \
unrar \ unrar \
&& \ && \
\
# Fetch and extract S6 overlay # Fetch and extract S6 overlay
curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \ curl -J -L -o /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz https://github.com/just-containers/s6-overlay/releases/download/${S6_OVERLAY_VERSION}/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz && \
tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / && \ tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C / --exclude='./bin' && \
tar xzf /tmp/s6-overlay-${S6_OVERLAY_ARCH}.tar.gz -C /usr ./bin && \
\
# Add user # Add user
useradd -U -d /config -s /bin/false plex && \ useradd -U -d /config -s /bin/false plex && \
usermod -G users plex && \ usermod -G users plex && \
\
# Setup directories # Setup directories
mkdir -p \ mkdir -p \
/config \ /config \
/transcode \ /transcode \
/data \ /data \
&& \ && \
\
# Cleanup # Cleanup
apt-get -y autoremove && \ apt-get -y autoremove && \
apt-get -y clean && \ apt-get -y clean && \