Merge pull request #690 from linuxserver/universal-calibre-update

universal-calibre update/add workflows
2026-03-23 00:05:28 +08:00 · 2023-05-20 15:41:59 -04:00 · 2023-05-20 15:41:59 -04:00 · ecfd76593a
commit ecfd76593a
parent 83408a3fd5 184d8619ae
6 changed files with 69 additions and 162 deletions
--- a/.github/workflows/BuildImage.yml
+++ b/.github/workflows/BuildImage.yml
@ -1,68 +1,45 @@
 name: Build Image

-on: [push, pull_request, workflow_dispatch]
+on: [push, pull_request_target, workflow_dispatch]

 env:
+  GITHUB_REPO: "linuxserver/docker-mods" #don't modify
  ENDPOINT: "linuxserver/mods" #don't modify
  BASEIMAGE: "universal" #replace
  MODNAME: "calibre" #replace

 jobs:
-  build:
+  set-vars:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2.3.3
+      - name: Set Vars
+        id: outputs
+        run: |
+          echo "GITHUB_REPO=${{ env.GITHUB_REPO }}" >> $GITHUB_OUTPUT
+          echo "ENDPOINT=${{ env.ENDPOINT }}" >> $GITHUB_OUTPUT
+          echo "BASEIMAGE=${{ env.BASEIMAGE }}" >> $GITHUB_OUTPUT
+          echo "MODNAME=${{ env.MODNAME }}" >> $GITHUB_OUTPUT
+          # **** If the mod needs to be versioned, set the versioning logic below. Otherwise leave as is. ****
+          MOD_VERSION=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" | jq -r '.tag_name')
+          echo "MOD_VERSION=${MOD_VERSION}" >> $GITHUB_OUTPUT
+    outputs:
+      GITHUB_REPO: ${{ steps.outputs.outputs.GITHUB_REPO }}
+      ENDPOINT: ${{ steps.outputs.outputs.ENDPOINT }}
+      BASEIMAGE: ${{ steps.outputs.outputs.BASEIMAGE }}
+      MODNAME: ${{ steps.outputs.outputs.MODNAME }}
+      MOD_VERSION: ${{ steps.outputs.outputs.MOD_VERSION }}

-      - name: Build image
-        run: |
-          # Set version
-          CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" | awk '/tag_name/{print $4;exit}' FS='[""]')
-          echo "CALIBRE_RELEASE=${CALIBRE_RELEASE}" >> $GITHUB_ENV
-          # Build image
-          docker build --no-cache --build-arg CALIBRE_RELEASE=${CALIBRE_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}-${{ env.CALIBRE_RELEASE }}
-          docker tag ${{ github.sha }} ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.CALIBRE_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}-${{ env.CALIBRE_RELEASE }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.CALIBRE_RELEASE }}-${{ github.sha }}
-          docker tag ${{ github.sha }} ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-      - name: Credential check
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) }}
-        run: |
-          echo "CR_USER=${{ secrets.CR_USER }}" >> $GITHUB_ENV
-          echo "CR_PAT=${{ secrets.CR_PAT }}" >> $GITHUB_ENV
-          echo "DOCKERUSER=${{ secrets.DOCKERUSER }}" >> $GITHUB_ENV
-          echo "DOCKERPASS=${{ secrets.DOCKERPASS }}" >> $GITHUB_ENV
-          if [[ "${{ secrets.CR_USER }}" == "" && "${{ secrets.CR_PAT }}" == "" && "${{ secrets.DOCKERUSER }}" == "" && "${{ secrets.DOCKERPASS }}" == "" ]]; then
-            echo "::error::Push credential secrets missing."
-            echo "::error::You must set either CR_USER & CR_PAT or DOCKERUSER & DOCKERPASS as secrets in your repo settings."
-            echo "::error::See https://github.com/linuxserver/docker-mods/blob/master/README.md for more information/instructions."
-            exit 1
-          fi
-      - name: Login to GitHub Container Registry
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.CR_USER && env.CR_PAT }}
-        run: |
-          echo "${{ secrets.CR_PAT }}" | docker login ghcr.io -u ${{ secrets.CR_USER }} --password-stdin
-      - name: Push tags to GitHub Container Registry
-        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}-${{ env.CALIBRE_RELEASE }}
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.CALIBRE_RELEASE }}-${{ github.sha }}
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ghcr.io/${ENDPOINT}:${BASEIMAGE}-${MODNAME}
-      - name: Login to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          echo ${{ secrets.DOCKERPASS }} | docker login -u ${{ secrets.DOCKERUSER }} --password-stdin
-      - name: Push tags to DockerHub
-        if: ${{ github.ref == format('refs/heads/{0}-{1}', env.BASEIMAGE, env.MODNAME) && env.DOCKERUSER && env.DOCKERPASS }}
-        run: |
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.CALIBRE_RELEASE }}
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ env.CALIBRE_RELEASE }}-${{ github.sha }}
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}-${{ github.sha }}
-          docker push ${ENDPOINT}:${BASEIMAGE}-${MODNAME}
+  build:
+    uses: linuxserver/github-workflows/.github/workflows/docker-mod-builder.yml@v1
+    needs: set-vars
+    secrets:
+      CR_USER: ${{ secrets.CR_USER }}
+      CR_PAT: ${{ secrets.CR_PAT }}
+      DOCKERUSER: ${{ secrets.DOCKERUSER }}
+      DOCKERPASS: ${{ secrets.DOCKERPASS }}
+    with:
+      GITHUB_REPO: ${{ needs.set-vars.outputs.GITHUB_REPO }}
+      ENDPOINT: ${{ needs.set-vars.outputs.ENDPOINT }}
+      BASEIMAGE: ${{ needs.set-vars.outputs.BASEIMAGE }}
+      MODNAME: ${{ needs.set-vars.outputs.MODNAME }}
+      MOD_VERSION: ${{ needs.set-vars.outputs.MOD_VERSION }}
--- a/.github/workflows/call_issue_pr_tracker.yml
+++ b/.github/workflows/call_issue_pr_tracker.yml
@ -0,0 +1,16 @@
+name: Issue & PR Tracker
+
+on:
+  issues:
+    types: [opened,reopened,labeled,unlabeled,closed]
+  pull_request_target:
+    types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
+  pull_request_review:
+    types: [submitted,edited,dismissed]
+
+jobs:
+  manage-project:
+    permissions:
+      issues: write
+    uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
+    secrets: inherit
--- a/.github/workflows/permissions.yml
+++ b/.github/workflows/permissions.yml
@ -0,0 +1,10 @@
+name: Permission check
+on:
+  pull_request_target:
+    paths:
+      - '**/run'
+      - '**/finish'
+      - '**/check'
+jobs:
+  permission_check:
+    uses: linuxserver/github-workflows/.github/workflows/init-svc-executable-permissions.yml@v1
--- a/21
+++ b/21
@ -1,19 +1,18 @@
-## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-ubuntu:focal as buildstage
+# syntax=docker/dockerfile:1

-ARG BUILD_DATE
-ARG VERSION
-ARG CALIBRE_RELEASE
-ARG DEBIAN_FRONTEND="noninteractive"
-LABEL build_version="Linuxserver.io version:- ${VERSION} Build-date:- ${BUILD_DATE}"
-LABEL maintainer="chbmb"
+## Buildstage ##
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
+
+ARG MOD_VERSION

 RUN \
  mkdir -p \
    /root-layer && \
-  CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-  | awk '/tag_name/{print $4;exit}' FS='[""]') && \
-  echo $CALIBRE_RELEASE > /root-layer/CALIBRE_RELEASE
+  if [[ -z "${MOD_VERSION}" ]]; then \
+    MOD_VERSION=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
+      | jq -r '.tag_name'); \
+  fi && \
+  echo $MOD_VERSION > /root-layer/CALIBRE_RELEASE

 # copy local files
 COPY root/ /root-layer/
--- a/root/etc/cont-init.d/95-apt-get
+++ b/root/etc/cont-init.d/95-apt-get
@ -1,5 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [ -f /usr/bin/apt ]; then
-    apt-get update
-fi
--- a/root/etc/cont-init.d/98-calibre
+++ b/root/etc/cont-init.d/98-calibre
@ -1,90 +0,0 @@
-#!/usr/bin/with-contenv bash
-
-if [[ "$(uname -m)" == "armv7l" ]]; then
-cat <<-EOF
-    ********************************************************
-    ********************************************************
-    *                                                      *
-    *                         !!!!                         *
-    *         This mod is not supported on armhf.          *
-    *                                                      *
-    ********************************************************
-    ********************************************************
-EOF
-exit 0
-fi
-
-if [ ! -f /usr/bin/apt ]; then
-cat <<-EOF
-    ********************************************************
-    ********************************************************
-    *                                                      *
-    *                         !!!!                         *
-    *    This mod is only supported on images using an     *
-    *                  Ubuntu base image.                  *
-    *                                                      *
-    ********************************************************
-    ********************************************************
-EOF
-exit 0
-fi
-
-export DEBIAN_FRONTEND="noninteractive"
-
-CALIBRE_RELEASE="$(cat /CALIBRE_RELEASE)"
-PACKAGES+=("xz-utils")
-
-if [ ! -L /usr/lib/x86_64-linux-gnu/libGL.so.1 ]; then
-    PACKAGES+=("libgl1-mesa-glx")
-fi
-
-if [ ! -L /usr/lib/x86_64-linux-gnu/libxdamage.so.1 ]; then
-    PACKAGES+=("libxdamage1")
-fi
-
-if [ ! -L /usr/lib/x86_64-linux-gnu/libEGL.so.1 ]; then
-    PACKAGES+=("libegl1")
-fi
-
-if [ ! -L /usr/lib/x86_64-linux-gnu/libxkbcommon.so.0 ]; then
-    PACKAGES+=("libxkbcommon0")
-fi
-
-if [ ! -L /usr/lib/x86_64-linux-gnu/libOpenGL.so.0 ]; then
-    PACKAGES+=("libopengl0")
-fi
-
-if [ -v "PACKAGES[@]" ]; then
-    apt-get install -y "${PACKAGES[@]}"
-fi
-
-echo "**** Fetching calibre bin ****" 
-if [ -z ${CALIBRE_RELEASE+x} ]; then
-    CALIBRE_RELEASE=$(curl -sX GET "https://api.github.com/repos/kovidgoyal/calibre/releases/latest" \
-    | awk '/tag_name/{print $4;exit}' FS='[""]'); \
-fi 
-
-mkdir -p \
-    /app/calibre
-
-if [ "$(uname -m)" == "x86_64" ]; then
-    curl -o \
-        /tmp/calibre.txz -L \
-        "https://github.com/kovidgoyal/calibre/releases/download/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE:1}-x86_64.txz"
-fi
-
-if [ "$(uname -m)" == "aarch64" ]; then
-    curl -o \
-        /tmp/calibre.txz -L \
-        "https://github.com/kovidgoyal/calibre/releases/download/${CALIBRE_RELEASE}/calibre-${CALIBRE_RELEASE:1}-arm64.txz"
-fi
-
-tar xf \
-    /tmp/calibre.txz \
-    -C /app/calibre
-
-rm /tmp/calibre.txz
-
-if [ ! -e /usr/bin/calibre-server ]; then
-    /app/calibre/calibre_postinstall
-fi