From 8eaeef6fcf89da5b9fb877fbf104b5263e36078b Mon Sep 17 00:00:00 2001 From: xpltd Date: Thu, 19 Mar 2026 07:26:11 -0500 Subject: [PATCH] v1.0.0: Fix Docker refs, Caddyfile, dedupe CI, add LICENSE - Fix docker-compose.yml: image ref xpltdco (was jlightner), healthcheck uses python (no curl in image) - Fix Caddyfile: reverse_proxy target matches docker-compose.example.yml service name (media-rip) - Remove duplicate release.yml workflow (publish.yml handles tag-triggered builds) - Fix publish.yml: use github.repository for portability, add contents:write for release creation - Add MIT LICENSE file --- .github/workflows/publish.yml | 4 +-- .github/workflows/release.yml | 57 ----------------------------------- Caddyfile | 2 +- LICENSE | 21 +++++++++++++ docker-compose.yml | 4 +-- 5 files changed, 26 insertions(+), 62 deletions(-) delete mode 100644 .github/workflows/release.yml create mode 100644 LICENSE diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index a914953..ed5e6c2 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -7,14 +7,14 @@ on: env: REGISTRY: ghcr.io - IMAGE_NAME: xpltdco/media-rip + IMAGE_NAME: ${{ github.repository }} jobs: publish: name: Build & push image runs-on: ubuntu-latest permissions: - contents: read + contents: write packages: write steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 7c50d0d..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Release - -on: - push: - tags: - - "v*" - -permissions: - contents: write - packages: write - -jobs: - release: - name: Build & Publish - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - - name: Set up QEMU (for multi-arch) - uses: docker/setup-qemu-action@v3 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - - name: Log in to GHCR - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata - id: meta - uses: docker/metadata-action@v5 - with: - images: ghcr.io/${{ github.repository }} - tags: | - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - type=semver,pattern={{major}} - type=raw,value=latest - - - name: Build and push - uses: docker/build-push-action@v6 - with: - context: . - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} - cache-from: type=gha - cache-to: type=gha,mode=max - - - name: Create GitHub Release - uses: softprops/action-gh-release@v2 - with: - generate_release_notes: true diff --git a/Caddyfile b/Caddyfile index d8a4e38..15435ca 100644 --- a/Caddyfile +++ b/Caddyfile @@ -3,5 +3,5 @@ # Replace {$DOMAIN} with your actual domain, or set DOMAIN in your .env file. {$DOMAIN:localhost} { - reverse_proxy mediarip:8000 + reverse_proxy media-rip:8000 } diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..6e3c2a5 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2026 xpltdco + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/docker-compose.yml b/docker-compose.yml index 624ca43..7885de5 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: mediarip: - image: ghcr.io/jlightner/media-rip:latest + image: ghcr.io/xpltdco/media-rip:latest # build: . # Uncomment to build from source ports: - "8080:8000" @@ -20,7 +20,7 @@ services: - MEDIARIP__SESSION__MODE=isolated restart: unless-stopped healthcheck: - test: ["CMD", "curl", "-f", "http://localhost:8000/api/health"] + test: ["CMD", "python", "-c", "import urllib.request; urllib.request.urlopen('http://localhost:8000/api/health')"] interval: 30s timeout: 5s retries: 3