From 3f35a2158d39735e12f0f66f48e479ea1e1a8d68 Mon Sep 17 00:00:00 2001 From: aptalca Date: Tue, 1 Dec 2020 12:17:29 -0500 Subject: [PATCH] jellyfin-opencl-intel: initial release --- .github/workflows/BuildImage.yml | 18 ++++++++++++---- Dockerfile | 32 +++++++++++++++++++++++++--- Dockerfile.complex | 23 -------------------- README.md | 18 ++++------------ root/etc/cont-init.d/98-opencl-intel | 26 ++++++++++++++++++++++ root/etc/cont-init.d/98-vpn-config | 27 ----------------------- root/etc/services.d/sshvpn/run | 3 --- 7 files changed, 73 insertions(+), 74 deletions(-) delete mode 100644 Dockerfile.complex create mode 100644 root/etc/cont-init.d/98-opencl-intel delete mode 100644 root/etc/cont-init.d/98-vpn-config delete mode 100644 root/etc/services.d/sshvpn/run diff --git a/.github/workflows/BuildImage.yml b/.github/workflows/BuildImage.yml index 518b0d8..c6e1db7 100644 --- a/.github/workflows/BuildImage.yml +++ b/.github/workflows/BuildImage.yml @@ -3,9 +3,9 @@ name: Build Image on: [push, pull_request, workflow_dispatch] env: - ENDPOINT: "linuxserver/mods" #don't modify - BASEIMAGE: "replace_baseimage" #replace - MODNAME: "replace_modname" #replace + ENDPOINT: "linuxserver/mods" + BASEIMAGE: "jellyfin" + MODNAME: "opencl-intel" jobs: build: @@ -15,14 +15,20 @@ jobs: - name: Build image run: | - docker build --no-cache -t ${{ github.sha }} . + COMP_RT_RELEASE=$(curl -u "${{ secrets.CR_USER }}:${{ secrets.CR_PAT }}" -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name') + echo "COMP_RT_RELEASE=${COMP_RT_RELEASE}" >> $GITHUB_ENV + docker build --no-cache --build-arg COMP_RT_RELEASE=${COMP_RT_RELEASE} -t ${{ github.sha }} . - name: Tag image if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }} run: | docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME} + docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE} + docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE}-${{ github.sha }} docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE} + docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE}-${{ github.sha }} docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} - name: Credential check @@ -48,6 +54,8 @@ jobs: if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }} run: | docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} + docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE}-${{ github.sha }} + docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE} docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME} - name: Login to DockerHub @@ -59,4 +67,6 @@ jobs: if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }} run: | docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }} + docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE}-${{ github.sha }} + docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${COMP_RT_RELEASE} docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME} diff --git a/Dockerfile b/Dockerfile index 4ece5e8..6e43798 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,32 @@ -FROM scratch +## Buildstage ## +FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage -LABEL maintainer="username" +ARG COMP_RT_RELEASE + +RUN \ + echo "**** install packages ****" && \ + apk add --no-cache \ + curl \ + jq && \ + if [ -z "${COMP_RT_RELEASE}" ]; then \ + COMP_RT_RELEASE=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/latest" | jq -r '.tag_name'); \ + fi && \ + COMP_RT_URLS=$(curl -sX GET "https://api.github.com/repos/intel/compute-runtime/releases/tags/${COMP_RT_RELEASE}" | jq -r '.body' | grep wget | grep -v ww47 | sed 's|wget ||g') && \ + echo "**** grab debs ****" && \ + mkdir -p /root-layer/opencl-intel && \ + for i in $COMP_RT_URLS; do \ + echo "downloading ${i%$'\r'}" && \ + curl -o /root-layer/opencl-intel/$(basename "${i%$'\r'}") \ + -L "${i%$'\r'}"; \ + done # copy local files -COPY root/ / +COPY root/ /root-layer/ + +## Single layer deployed image ## +FROM scratch + +LABEL maintainer="aptalca" + +# Add files from buildstage +COPY --from=buildstage /root-layer/ / diff --git a/Dockerfile.complex b/Dockerfile.complex deleted file mode 100644 index db4598e..0000000 --- a/Dockerfile.complex +++ /dev/null @@ -1,23 +0,0 @@ -## Buildstage ## -FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage - -RUN \ - echo "**** install packages ****" && \ - apk add --no-cache \ - curl && \ - echo "**** grab rclone ****" && \ - mkdir -p /root-layer && \ - curl -o \ - /root-layer/rclone.deb -L \ - "https://downloads.rclone.org/v1.47.0/rclone-v1.47.0-linux-amd64.deb" - -# copy local files -COPY root/ /root-layer/ - -## Single layer deployed image ## -FROM scratch - -LABEL maintainer="username" - -# Add files from buildstage -COPY --from=buildstage /root-layer/ / diff --git a/README.md b/README.md index 5636dec..c87f007 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,7 @@ -# Rsync - Docker mod for openssh-server +# Opencl-Intel - Docker mod for Jellyfin -This mod adds rsync to openssh-server, to be installed/updated during container start. +This mod adds opencl-intel to jellyfin, to be installed/updated during container start. -In openssh-server docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:openssh-server-rsync` +In jellyfin docker arguments, set an environment variable `DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel` -If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:openssh-server-rsync|linuxserver/mods:openssh-server-mod2` - -# Mod creation instructions - -* Fork the repo, create a new branch based on the branch `template`. -* Edit the `Dockerfile` for the mod. `Dockerfile.complex` is only an example and included for reference; it should be deleted when done. -* Inspect the `root` folder contents. Edit, add and remove as necessary. -* Edit this readme with pertinent info, delete these instructions. -* Finally edit the `.github/workflows/BuildImage.yml`. Customize the build branch, and the vars for `BASEIMAGE` and `MODNAME`. -* Ask the team to create a new branch named `-`. Baseimage should be the name of the image the mod will be applied to. The new branch will be based on the `template` branch. -* Submit PR against the branch created by the team. +If adding multiple mods, enter them in an array separated by `|`, such as `DOCKER_MODS=linuxserver/mods:jellyfin-opencl-intel|linuxserver/mods:jellyfin-mod2` diff --git a/root/etc/cont-init.d/98-opencl-intel b/root/etc/cont-init.d/98-opencl-intel new file mode 100644 index 0000000..3cc6779 --- /dev/null +++ b/root/etc/cont-init.d/98-opencl-intel @@ -0,0 +1,26 @@ +#!/usr/bin/with-contenv bash + +# Determine if setup is needed +if [ ! -f "/usr/bin/apt" ]; then + echo "Image is not Ubuntu, skipping opencl-intel install" + exit 0 +fi + +if [ $(uname -m) != "x86_64" ]; then + echo "Opencl-intel only works on X86_64, skipping" + exit 0 +fi + +echo "installing clinfo" +apt-get update +apt-get install -y \ + clinfo + +if [ -d /opencl-intel ]; then + echo "Installing/updating opencl-intel debs" + cd /opencl-intel + dpkg -i /opencl-intel/*.deb + rm -rf /opencl-intel +else + echo "Opencl-intel already installed" +fi diff --git a/root/etc/cont-init.d/98-vpn-config b/root/etc/cont-init.d/98-vpn-config deleted file mode 100644 index a5f9127..0000000 --- a/root/etc/cont-init.d/98-vpn-config +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/with-contenv bash - -# Determine if setup is needed -if [ ! -f /usr/local/lib/python***/dist-packages/sshuttle ] && \ -[ -f /usr/bin/apt ]; then - ## Ubuntu - apt-get update - apt-get install --no-install-recommends -y \ - iptables \ - openssh-client \ - python3 \ - python3-pip - pip3 install sshuttle -fi -if [ ! -f /usr/lib/python***/site-packages/sshuttle ] && \ -[ -f /sbin/apk ]; then - # Alpine - apk add --no-cache \ - iptables \ - openssh \ - py3-pip \ - python3 - pip3 install sshuttle -fi - -chown -R root:root /root -chmod -R 600 /root/.ssh diff --git a/root/etc/services.d/sshvpn/run b/root/etc/services.d/sshvpn/run deleted file mode 100644 index 7d49e79..0000000 --- a/root/etc/services.d/sshvpn/run +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/with-contenv bash - -sshuttle --dns --remote root@${HOST}:${PORT} 0/0 -x 172.17.0.0/16