diff options
| -rw-r--r-- | .gitea/workflows/git-sync.yaml | 3 | ||||
| -rw-r--r-- | .gitea/workflows/release.yaml | 29 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | core/0001.patch | 14 | ||||
| -rw-r--r-- | core/Dockerfile | 4 |
5 files changed, 29 insertions, 29 deletions
diff --git a/.gitea/workflows/git-sync.yaml b/.gitea/workflows/git-sync.yaml index 0dfad3f..3af5dcd 100644 --- a/.gitea/workflows/git-sync.yaml +++ b/.gitea/workflows/git-sync.yaml @@ -10,6 +10,9 @@ jobs: runs-on: ubuntu-latest steps: + - name: Collect Workflow Telemetry + uses: catchpoint/workflow-telemetry-action@v2 + - name: git-sync env: git_sync_source_repo: git@git.fridu.us:heckyel/yt-local-docker.git diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index d580c5b..12e6b1f 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -10,12 +10,13 @@ on: jobs: release-default: runs-on: ubuntu-latest - container: - image: gitea/runner-images:ubuntu-latest steps: - name: Checkout uses: actions/checkout@v4 + - name: Extract YT_BRANCH version + run: echo "VERSION=$(grep -oP 'ARG YT_BRANCH="\K[^"]+' core/Dockerfile)" >> $GITHUB_ENV + - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -40,26 +41,24 @@ jobs: with: context: core file: core/Dockerfile - platforms: | - linux/amd64 - linux/arm/v7 - linux/arm64 - linux/386 push: false + platforms: linux/amd64 # load not supported for multi-platform builds no-cache: true + load: true # load is required to use the image in analyze trivy step tags: | ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:latest - ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:v0.2.19 + ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:${{ env.VERSION }} - name: Run Trivy vulnerability scanner - uses: aquasecurity/trivy-action@master + uses: astounds/trivy-action@v1 with: - image-ref: ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:latest + image: ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:latest + severity: 'CRITICAL,HIGH' + pkg-types: 'os' format: 'table' - exit-code: '1' ignore-unfixed: true - vuln-type: 'os' - severity: 'CRITICAL,HIGH' + exit-code: '1' + version: 'v0.58.2' - name: Push Docker image uses: docker/build-push-action@v6 @@ -68,11 +67,9 @@ jobs: file: core/Dockerfile platforms: | linux/amd64 - linux/arm/v7 linux/arm64 - linux/386 push: true no-cache: false tags: | ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:latest - ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:v0.2.19 + ${{ secrets.DOCKER_REGISTRY_USER}}/yt-local:${{ env.VERSION }} @@ -3,11 +3,11 @@ YT-Local in mode public instance for docker ```console -$ cp -v config.env.example config.env +cp -v config.env.example config.env ``` ```console -$ docker-compose up -d +docker-compose up -d ``` ## Build container from source @@ -15,9 +15,9 @@ $ docker-compose up -d To rebuild this container, copy this repository locally and run: ```console -$ cd core/ +cd core/ ``` ```console -$ docker build --no-cache --tag yt-local -f Dockerfile . +docker build --no-cache --tag yt-local -f Dockerfile . ``` diff --git a/core/0001.patch b/core/0001.patch index c73e4a5..b87aeb0 100644 --- a/core/0001.patch +++ b/core/0001.patch @@ -1,8 +1,8 @@ diff --git a/settings.py b/settings.py -index eb210c5..fce9c56 100644 +index 2de5efa..7e0a452 100644 --- a/settings.py +++ b/settings.py -@@ -589,6 +589,6 @@ def settings_page(): +@@ -591,6 +591,6 @@ def settings_page(): for func, old_value, value in to_call: func(old_value, value) @@ -11,7 +11,7 @@ index eb210c5..fce9c56 100644 else: flask.abort(400) diff --git a/youtube/__init__.py b/youtube/__init__.py -index 64aed56..437c5ad 100644 +index 0072f74..3a4a4b1 100644 --- a/youtube/__init__.py +++ b/youtube/__init__.py @@ -14,9 +14,6 @@ yt_app.url_map.strict_slashes = False @@ -25,10 +25,10 @@ index 64aed56..437c5ad 100644 def homepage(): return flask.render_template('home.html', title="YT Local") diff --git a/youtube/static/channel.css b/youtube/static/channel.css -index 030bc11..29f0c05 100644 +index e842beb..ca68246 100644 --- a/youtube/static/channel.css +++ b/youtube/static/channel.css -@@ -268,11 +268,9 @@ hr { +@@ -269,11 +269,9 @@ hr { .item-box { display: grid; @@ -115,10 +115,10 @@ index e4e9c8b..8acb9b1 100644 .item-video { diff --git a/youtube/static/watch.css b/youtube/static/watch.css -index 460bba3..181fb94 100644 +index c0bdec6..447bf6d 100644 --- a/youtube/static/watch.css +++ b/youtube/static/watch.css -@@ -398,11 +398,9 @@ figure.sc-video { +@@ -421,11 +421,9 @@ figure.sc-video { .item-box { display: grid; diff --git a/core/Dockerfile b/core/Dockerfile index 79ffae4..a7f8792 100644 --- a/core/Dockerfile +++ b/core/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/python:3.11-alpine AS base +FROM docker.io/python:3.13-alpine AS base FROM base AS builder @@ -7,7 +7,7 @@ ENV LC_ALL=C.UTF-8 ARG APP_DIR="/srv/app" ARG YT_REPO="https://git.fridu.us/heckyel/yt-local.git" -ARG YT_BRANCH="v0.2.19" +ARG YT_BRANCH="v0.3.2" RUN apk update && \ apk upgrade && \ |