diff --git a/.gitea/workflows/deployment.yml b/.gitea/workflows/deployment.yml index b65eb9ae..9a841096 100644 --- a/.gitea/workflows/deployment.yml +++ b/.gitea/workflows/deployment.yml @@ -17,15 +17,15 @@ jobs: - name: PR list id: list-prs run: | - curl -sSL https://dl.gitea.com/tea/main/tea-main-linux-amd64 -o /usr/local/bin/tea - chmod +x /usr/local/bin/tea - echo "Listing PRs..." - tea login add --name gitea-rinoa --url ${{ vars.RINOA_GITEA_URL }} --user gitea-sonarqube-bot --password "${{ secrets.BOT_GITEA_PASSWORD }}" --token ${{ secrets.BOT_GITEA_TOKEN }} - pr_state=$(tea pr ls --repo ${{ github.repository }} --state open --output csv | egrep 'open|closed|merged' | awk -F, '{print $3}' | sed -e 's|"||g') - echo "pr_state=$(echo ${pr_state})" >> "$GITHUB_OUTPUT" + pr_check=$(curl ${{ vars.RINOA_GITEA_URL }}/api/v1/repos/${{ github.repository }}/pulls/main/${{ github.ref_name }} \ + -X 'GET' \ + -H 'Accept: application/json' \ + -H 'Authorization: token ${{ secrets.BOT_GITEA_TOKEN }}' \ + -s | jq '{index: .number, state: .state}') + pr_state=$(echo ${pr_check} | jq -r '.state') - name: Create PR - if: steps.list-prs.outputs.pr_state == 'closed' + if: steps.list-prs.outputs.pr_state != 'open' uses: arifer612/Gitea-PR-action@v1.2.0 with: url: ${{ gitea.server_url }} diff --git a/docker-compose.yml b/docker-compose.yml index dc8d0dcc..b7fbcac1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4531,6 +4531,27 @@ services: type: bind bind: create_host_path: true + spotisub: + container_name: spotisub + environment: + SPOTIPY_CLIENT_ID: ${YOUR_SPOTIFY_ID} + SPOTIPY_CLIENT_SECRET: ${YOUR_SPOTIFY_SECRET} + SPOTIPY_REDIRECT_URI: http://127.0.0.1:8080/ + SUBSONIC_API_HOST: http://navidrome + SUBSONIC_API_PORT: 4533 + SUBSONIC_API_USER: ${NAVIDROME_USERNAME} + SUBSONIC_API_PASS: ${NAVIDROME_PASSWORD} + healthcheck: + test: curl -s http://127.0.0.1:5183/api/v1/utils/healthcheck | grep -q 'Ok!' || exit 1 + interval: 30s + retries: 20 + start_period: 30s + image: blastbeng/spotisub:latest + ports: + - 5183:5183 + restart: always + volumes: + - ${DOCKER_VOLUME_CONFIG}/spotisub:/home/user/spotisub/cache swag: cap_add: - NET_ADMIN