diff --git a/.gitea/workflows/build-docker-image.yml b/.gitea/workflows/build-docker-image.yml index 2ab598a..4e79ec5 100644 --- a/.gitea/workflows/build-docker-image.yml +++ b/.gitea/workflows/build-docker-image.yml @@ -24,6 +24,24 @@ jobs: REF="${GITEA_REF:-$GITHUB_REF}" TAG="${REF#refs/tags/}" echo "TAG=$TAG" >> $GITHUB_ENV + + - name: Download linux-zip artifact from other run + uses: actions/download-artifact@v4 + with: + name: linux-zip + github-token: ${{ secrets.REPO_READ }} + repository: ${{ github.repository }} + run-id: ${{ github.run_id }} + + - name: Extract linux-zip artifact + run: | + set -e + tar -xzf linux-zip.tar.gz + + + + + - name: Build Docker image with release tag run: docker build ./ -t ${{ env.REGISTRY_URL }}/${{ env.REGISTRY_OWNER }}/${{ env.IMAGE_NAME }}:${{ env.TAG }} diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 77f6894..9d4ba24 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -130,10 +130,10 @@ jobs: # Cleanup rm -rf "$WORKSPACE_ROOT/dist/linux/ffmpeg_temp" "$WORKSPACE_ROOT/dist/linux/aria2c_build" "$WORKSPACE_ROOT/dist/linux/ffmpeg.tar.xz" "$WORKSPACE_ROOT/aria2-1.37.0" "$WORKSPACE_ROOT/aria2-1.37.0.tar.gz" - # Zip everything + # GZip everything cd "$WORKSPACE_ROOT/dist/linux" - ZIP_NAME="yt-playlist-linux-${TAG}.zip" - zip -r "$WORKSPACE_ROOT/$ZIP_NAME" * + ZIP_NAME="yt-playlist-linux-${TAG}.tar.gz" + tar -czf "$WORKSPACE_ROOT/$ZIP_NAME" * echo "ZIP_PATH=$WORKSPACE_ROOT/$ZIP_NAME" >> $GITHUB_ENV - name: Upload Linux artifact diff --git a/Dockerfile b/Dockerfile index bf23dc2..c03b547 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,17 +1,10 @@ -FROM python:3.12-slim +FROM python:3.12-alpine WORKDIR /app -# Install runtime dependencies: aria2, ffmpeg, yt-dlp -# Use --no-install-recommends to keep image small and clean up apt lists -RUN apt-get update \ - && apt-get install -y --no-install-recommends \ - ca-certificates \ - aria2 \ - ffmpeg \ - yt-dlp \ - && rm -rf /var/lib/apt/lists/* - COPY yt-playlist-main.py /app/ +COPY ./bin/ffmpeg /app/bin +COPY ./bin/yt-dlp /app/bin +COPY ./bin/aria2c /app/bin CMD ["python", "yt-playlist-main.py"]