standardize apt-get, rebase to 3.14

This commit is contained in:
aptalca
2021-09-21 14:20:27 -04:00
parent 194b1c7b85
commit dc75c53b1d
3 changed files with 27 additions and 24 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
## Buildstage ##
FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as buildstage
# Build arguments
ARG VERSION
+5
View File
@@ -0,0 +1,5 @@
#!/usr/bin/with-contenv bash
if [ -f /usr/bin/apt ]; then
apt-get update
fi
-2
View File
@@ -18,7 +18,6 @@ if [ ! -f /usr/bin/mkvmerge ]; then
if [ -f /usr/bin/apt ]; then
# Ubuntu
echo "Installing MKVToolNix using apt-get"
apt-get update && \
apt-get -y install mkvtoolnix && \
rm -rf /var/lib/apt/lists/*
elif [ -f /sbin/apk ]; then
@@ -29,7 +28,6 @@ if [ ! -f /usr/bin/mkvmerge ]; then
else
# Unknown
echo "Unknown package manager. Attempting to install MKVToolNix using apt-get"
apt-get update && \
apt-get -y install mkvtoolnix && \
rm -rf /var/lib/apt/lists/*
fi