diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 3381e26..d843e2b 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -30,7 +30,6 @@ jobs: - name: Build and push uses: docker/build-push-action@v5 with: - #platforms: linux/386,linux/amd64,linux/arm64/v8,linux/arm/v6,linux/arm/v7,linux/ppc64le,linux/s390x - platforms: linux/amd64 + platforms: linux/386,linux/amd64,linux/arm64/v8,linux/arm/v5,linux/arm/v7,linux/mips64le,linux/ppc64le,linux/s390x,linux/riscv64 tags: ${{ env.IMAGE_NAME }}:latest push: true \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index 1a5198e..16f936a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,39 +1,13 @@ -FROM archlinux:latest +FROM kjake/base LABEL maintainer="kjake" -RUN sed -i '/^\[extra\]/,/^Include/s/^#//' /etc/pacman.conf - -RUN pacman -Syu --noconfirm && \ +RUN apt-get -qq update && \ + apt-get install -y --no-install-recommends streamlink jq tzdata wget gosu # the following would be needed to support VAAPI, but essentially limits architectures to only amd64 # intel-media-driver libva-intel-driver libva-vdpau-driver - pacman -S --noconfirm streamlink jq ca-certificates tzdata wget gnupg - -ENV GOSU_VERSION 1.17 -RUN set -eux; \ - pacmanArch="$(pacman -Q --info pacman | grep Architecture | awk '{ print $3 }')"; \ - case "$pacmanArch" in \ - aarch64) pacmanArch='arm64' ;; \ - armv[67]*) pacmanArch='armhf' ;; \ - i[3456]86) pacmanArch='i386' ;; \ - ppc64le) pacmanArch='ppc64el' ;; \ - riscv64 | s390x) pacmanArch="$rpmArch" ;; \ - x86_64) pacmanArch='amd64' ;; \ - *) echo >&2 "error: unknown/unsupported architecture '$pacmanArch'"; exit 1 ;; \ - esac; \ - wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$pacmanArch"; \ - wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$pacmanArch.asc"; \ - \ -# verify the signature - export GNUPGHOME="$(mktemp -d)"; \ - gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \ - gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \ - gpgconf --kill all; \ - rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \ - \ - chmod +x /usr/local/bin/gosu; - + RUN mkdir /home/download /home/script /home/plugins && \ - rm -rf /var/cache/pacman/pkg/* /tmp/* /var/tmp/ + rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/ COPY ./streamlink-recorder.sh /home/script/ COPY ./entrypoint.sh /home/script