From 9fd630bcc40aa628401fe893dc38bc2716404421 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 20:52:34 +0100 Subject: [PATCH 1/8] fix: Switch to forgejo --- .forgejo/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index dfa0268..2996db8 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -31,14 +31,14 @@ jobs: uses: docker/login-action@v2 with: registry: git.depeuter.dev - username: ${{ gitea.actor }} + username: ${{ forgejo.actor }} password: ${{ secrets.CI_TOKEN }} - name: Get Meta id: meta uses: docker/metadata-action@v5 with: - images: git.depeuter.dev/${{ gitea.repository }} + images: git.depeuter.dev/${{ forgejo.repository }} - name: Build and push id: docker_build @@ -48,7 +48,7 @@ jobs: file: ./frontend/Dockerfile push: true tags: ${{ steps.meta.output.tags }} - label: ${{ steps.meta.output.labels }} + labels: ${{ steps.meta.output.labels }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file From 0d307182d13effb6f9d351d2520b1ded78491928 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 21:09:07 +0100 Subject: [PATCH 2/8] fix: Set versions --- .forgejo/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 2996db8..35743cd 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -25,14 +25,14 @@ jobs: uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Login to Container Registry uses: docker/login-action@v2 with: registry: git.depeuter.dev username: ${{ forgejo.actor }} - password: ${{ secrets.CI_TOKEN }} + password: ${{ secrets.FORGEJO_TOKEN }} - name: Get Meta id: meta @@ -42,7 +42,7 @@ jobs: - name: Build and push id: docker_build - uses: docker/build-push-action@v5 + uses: docker/build-push-action@v4 with: context: . file: ./frontend/Dockerfile From 3ff3542b470f9aa68eb24b69e982dd1931db0bf3 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 21:13:58 +0100 Subject: [PATCH 3/8] fix: Switch to GitHub --- .forgejo/workflows/release.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 35743cd..f2477e0 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -31,14 +31,14 @@ jobs: uses: docker/login-action@v2 with: registry: git.depeuter.dev - username: ${{ forgejo.actor }} - password: ${{ secrets.FORGEJO_TOKEN }} + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} - name: Get Meta id: meta uses: docker/metadata-action@v5 with: - images: git.depeuter.dev/${{ forgejo.repository }} + images: git.depeuter.dev/${{ github.repository }} - name: Build and push id: docker_build From c201ba00dc42c512bdebc64f883b240643ac209c Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 21:19:54 +0100 Subject: [PATCH 4/8] fix: typo output -> outputs --- .forgejo/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index f2477e0..4014ede 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -47,8 +47,8 @@ jobs: context: . file: ./frontend/Dockerfile push: true - tags: ${{ steps.meta.output.tags }} - labels: ${{ steps.meta.output.labels }} + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} - name: Image digest run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file From 771db6c8b54716cd883d501131ae4606c231ceb3 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 21:21:18 +0100 Subject: [PATCH 5/8] fix: Switch token --- .forgejo/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 4014ede..7869e4b 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -32,7 +32,7 @@ jobs: with: registry: git.depeuter.dev username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} + password: ${{ secrets.CI_TOKEN }} - name: Get Meta id: meta From 9bb1f2068f3a923634e7405ac7b6465d71b188b8 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Sun, 2 Feb 2025 21:27:42 +0100 Subject: [PATCH 6/8] chore: Set download path to sensible --- backend/queueManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/queueManager.ts b/backend/queueManager.ts index 4c06ea0..d4bead3 100644 --- a/backend/queueManager.ts +++ b/backend/queueManager.ts @@ -187,7 +187,7 @@ class QueueManager { try { const timeout: number = (item.timeout ?? TIMEOUT) * item.song.trackCount; - const result: DownloadResult = await this.lucida.download(item.song.url, '/tmp', timeout, current); + const result: DownloadResult = await this.lucida.download(item.song.url, '/data', timeout, current); if (!result.success && (item.retries ?? 0) + 1 < RETRIES) { item.retries = (item.retries ?? 0) + 1; From 5ebf2043c1cd9db8e9c25298e3e897b9e2a7096d Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Thu, 13 Feb 2025 20:46:49 +0100 Subject: [PATCH 7/8] chore(docker): backend/frontend --- .forgejo/workflows/release.yaml | 35 +++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 7869e4b..89ae0d2 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -34,21 +34,40 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.CI_TOKEN }} - - name: Get Meta - id: meta + - name: Get Meta for frontend + id: meta_frontend uses: docker/metadata-action@v5 with: - images: git.depeuter.dev/${{ github.repository }} + images: git.depeuter.dev/${{ github.repository }}/frontend - - name: Build and push - id: docker_build + - name: Build and push frontend + id: docker_build_frontend uses: docker/build-push-action@v4 with: - context: . + context: ./frontend file: ./frontend/Dockerfile push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} \ No newline at end of file + - name: Get Meta for backend + id: meta_backend + uses: docker/metadata-action@v5 + with: + images: git.depeuter.dev/${{ github.repository }}/backend + + - name: Build and push backend + id: docker_build_backend + uses: docker/build-push-action@v4 + with: + context: ./backend + file: ./backend/Dockerfile + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + + - name: Frontend image digest + run: echo ${{ steps.docker_build_frontend.outputs.digest }} + + - name: Backend image digest + run: echo ${{ steps.docker_build_backend.outputs.digest }} From 245399413ff0cec3ca575ebe8fb05710fcd4539b Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Thu, 13 Feb 2025 20:49:02 +0100 Subject: [PATCH 8/8] fix(docker): Fix labels/tags --- .forgejo/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 89ae0d2..9ba34b1 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -47,8 +47,8 @@ jobs: context: ./frontend file: ./frontend/Dockerfile push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ steps.meta_frontend.outputs.tags }} + labels: ${{ steps.meta_frontend.outputs.labels }} - name: Get Meta for backend id: meta_backend @@ -63,8 +63,8 @@ jobs: context: ./backend file: ./backend/Dockerfile push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + tags: ${{ steps.meta_backend.outputs.tags }} + labels: ${{ steps.meta_backend.outputs.labels }} - name: Frontend image digest run: echo ${{ steps.docker_build_frontend.outputs.digest }}