Merge pull request #66 from Nicba1010/main

General build improvements

.dockerignore

@@ -1 +1,15 @@
-.env
+.dockerignore
+.env
+.env.sample
+.git
+.github
+.gitignore
+.idea
+.vscode
+
+Dockerfile*
+README.md
+
+test
+
+venv

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
     paths-ignore:
       - .gitignore
       - "*.md"
-  
+
 jobs:
   pytest:
     runs-on: ubuntu-latest
@@ -24,25 +24,32 @@ jobs:
   docker:
     runs-on: ubuntu-latest
     needs: pytest
+    strategy:
+      matrix:
+        include:
+          - dockerfile: Dockerfile.alpine
+            variant: alpine
+          - dockerfile: Dockerfile.slim
+            variant: slim
     steps:
       - name: Checkout
         uses: actions/checkout@v3
 
       - name: Docker meta
         id: docker_meta
-        env:
-          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        if: "${{ env.DOCKER_USERNAME != '' }}"
         uses: docker/metadata-action@v4
         with:
-          images: ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched # list of Docker images to use as base name for tags
+          images: |
+            ${{ secrets.DOCKER_USERNAME }}/jellyplex-watched,enable=${{ secrets.DOCKER_USERNAME != '' }}
+            ghcr.io/${{ github.repository_owner }}/jellyplex-watched
           tags: |
-            type=raw,value=latest,enable={{is_default_branch}}
-            type=ref,event=branch
-            type=ref,event=pr
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=sha
+            type=raw,value=latest,enable=${{ matrix.variant == 'alpine' && github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
+            type=raw,value=latest,suffix=-${{ matrix.variant }},enable={{ is_default_branch }}
+            type=ref,event=branch,suffix=-${{ matrix.variant }}
+            type=ref,event=pr,suffix=-${{ matrix.variant }}
+            type=semver,pattern={{ version }},suffix=-${{ matrix.variant }}
+            type=semver,pattern={{ major }}.{{ minor }},suffix=-${{ matrix.variant }}
+            type=sha,suffix=-${{ matrix.variant }}
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -51,30 +58,40 @@ jobs:
         uses: docker/setup-buildx-action@v2
 
       - name: Login to DockerHub
-        if: "${{ steps.docker_meta.outcome == 'success' }}"
+        env:
+          DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+        if: "${{ env.DOCKER_USERNAME != '' }}"
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
 
+      - name: Login to GitHub Container Registry
+        if: "${{ steps.docker_meta.outcome == 'success' }}"
+        uses: docker/login-action@v2
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
       - name: Build
         id: build
         if: "${{ steps.docker_meta.outcome == 'skipped' }}"
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile
+          file: ${{ matrix.dockerfile }}
           platforms: linux/amd64,linux/arm64
           push: false
           tags: jellyplex-watched:action
-      
+
       - name: Build Push
         id: build_push
         if: "${{ steps.docker_meta.outcome == 'success' }}"
         uses: docker/build-push-action@v3
         with:
           context: .
-          file: ./Dockerfile
+          file: ${{ matrix.dockerfile }}
           platforms: linux/amd64,linux/arm64
           push: true
           tags: ${{ steps.docker_meta.outputs.tags }}

Dockerfile.alpine

@@ -0,0 +1,41 @@
+FROM python:3-alpine
+
+ENV DRYRUN 'True'
+ENV DEBUG 'True'
+ENV DEBUG_LEVEL 'INFO'
+ENV SLEEP_DURATION '3600'
+ENV LOGFILE 'log.log'
+
+ENV USER_MAPPING ''
+ENV LIBRARY_MAPPING ''
+
+ENV PLEX_BASEURL ''
+ENV PLEX_TOKEN ''
+ENV PLEX_USERNAME ''
+ENV PLEX_PASSWORD ''
+ENV PLEX_SERVERNAME ''
+
+ENV JELLYFIN_BASEURL ''
+ENV JELLYFIN_TOKEN ''
+
+ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
+ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
+ENV SYNC_FROM_PLEX_TO_PLEX 'True'
+ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
+
+ENV BLACKLIST_LIBRARY ''
+ENV WHITELIST_LIBRARY ''
+ENV BLACKLIST_LIBRARY_TYPE  '' 
+ENV WHITELIST_LIBRARY_TYPE  ''
+ENV BLACKLIST_USERS  ''
+ENV WHITELIST_USERS  ''
+
+WORKDIR /app
+
+COPY ./requirements.txt ./
+
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD ["python", "-u", "main.py"]

Dockerfile.slim

@@ -1,46 +1,40 @@
-FROM python:3-slim
-
-ENV DRYRUN 'True'
-ENV DEBUG 'True'
-ENV DEBUG_LEVEL 'INFO'
-ENV SLEEP_DURATION '3600'
-ENV LOGFILE 'log.log'
-
-ENV USER_MAPPING ''
-ENV LIBRARY_MAPPING ''
-
-ENV PLEX_BASEURL ''
-ENV PLEX_TOKEN ''
-ENV PLEX_USERNAME ''
-ENV PLEX_PASSWORD ''
-ENV PLEX_SERVERNAME ''
-
-ENV JELLYFIN_BASEURL ''
-ENV JELLYFIN_TOKEN ''
-
-ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
-ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
-ENV SYNC_FROM_PLEX_TO_PLEX 'True'
-ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
-
-ENV BLACKLIST_LIBRARY ''
-ENV WHITELIST_LIBRARY ''
-ENV BLACKLIST_LIBRARY_TYPE  '' 
-ENV WHITELIST_LIBRARY_TYPE  ''
-ENV BLACKLIST_USERS  ''
-ENV WHITELIST_USERS  ''
-
-WORKDIR /app
-
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-        build-essential && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-COPY ./requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-
-COPY . .
-
-CMD ["python", "-u", "main.py"]
+FROM python:3-slim
+
+ENV DRYRUN 'True'
+ENV DEBUG 'True'
+ENV DEBUG_LEVEL 'INFO'
+ENV SLEEP_DURATION '3600'
+ENV LOGFILE 'log.log'
+
+ENV USER_MAPPING ''
+ENV LIBRARY_MAPPING ''
+
+ENV PLEX_BASEURL ''
+ENV PLEX_TOKEN ''
+ENV PLEX_USERNAME ''
+ENV PLEX_PASSWORD ''
+ENV PLEX_SERVERNAME ''
+
+ENV JELLYFIN_BASEURL ''
+ENV JELLYFIN_TOKEN ''
+
+ENV SYNC_FROM_PLEX_TO_JELLYFIN 'True'
+ENV SYNC_FROM_JELLYFIN_TO_PLEX 'True'
+ENV SYNC_FROM_PLEX_TO_PLEX 'True'
+ENV SYNC_FROM_JELLYFIN_TO_JELLYFIN 'True'
+
+ENV BLACKLIST_LIBRARY ''
+ENV WHITELIST_LIBRARY ''
+ENV BLACKLIST_LIBRARY_TYPE  '' 
+ENV WHITELIST_LIBRARY_TYPE  ''
+ENV BLACKLIST_USERS  ''
+ENV WHITELIST_USERS  ''
+
+WORKDIR /app
+
+COPY ./requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
+COPY . .
+
+CMD ["python", "-u", "main.py"]

requirements.txt

@@ -1,4 +1,4 @@
-plexapi
-requests
-python-dotenv
-aiohttp
+PlexAPI==4.13.4
+requests==2.28.2
+python-dotenv==1.0.0
+aiohttp==3.8.4

test/requirements.txt

@@ -1 +1 @@
-pytest
+pytest==7.3.0