diff --git a/.github/workflows/docker-build-releases.yaml b/.github/workflows/docker-build-releases.yaml index fef35d10..d7c8f021 100644 --- a/.github/workflows/docker-build-releases.yaml +++ b/.github/workflows/docker-build-releases.yaml @@ -18,22 +18,28 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Set SHAIRPORT_SYNC_BRANCH env. run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV + - name: Set up ssh agent uses: webfactory/ssh-agent@v0.5.2 # Can be removed when no longer pulling from private repos. with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Set up QEMU uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Login to Docker Registry uses: docker/login-action@v1 with: registry: registry.nova.do username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} + - name: Build and push uses: docker/build-push-action@v2 with: @@ -45,6 +51,7 @@ jobs: build-args: | SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} ssh: default=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos. + - name: Build and push (AirPlay 1) uses: docker/build-push-action@v2 with: diff --git a/.github/workflows/docker-build.yaml b/.github/workflows/docker-build.yaml index a6dacf47..5422b24a 100644 --- a/.github/workflows/docker-build.yaml +++ b/.github/workflows/docker-build.yaml @@ -16,22 +16,28 @@ jobs: uses: actions/checkout@v2 with: fetch-depth: 0 + - name: Set SHAIRPORT_SYNC_BRANCH env. run: echo "SHAIRPORT_SYNC_BRANCH=${GITHUB_REF##*/}" >> $GITHUB_ENV + - name: Set up ssh agent uses: webfactory/ssh-agent@v0.5.2 # Can be removed when no longer pulling from private repos. with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} + - name: Set up QEMU uses: docker/setup-qemu-action@v1 + - name: Set up Docker Buildx uses: docker/setup-buildx-action@v1 + - name: Login to Docker Registry uses: docker/login-action@v1 with: registry: registry.nova.do username: ${{ secrets.DOCKER_REGISTRY_USER }} password: ${{ secrets.DOCKER_REGISTRY_TOKEN }} + - name: Build and push uses: docker/build-push-action@v2 with: @@ -43,6 +49,7 @@ jobs: build-args: | SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} ssh: default=${{ env.SSH_AUTH_SOCK }} # Can be removed when no longer pulling from private repos. + - name: Build and push (AirPlay 1) uses: docker/build-push-action@v2 with: @@ -50,6 +57,6 @@ jobs: file: ./docker/airplay1/Dockerfile platforms: linux/386,linux/amd64,linux/arm/v6,linux/arm64,linux/arm/v7 push: true - tags: registry.nova.do/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}-airplay1 + tags: registry.nova.do/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}-airplay1 registry.nova.do/shairport-sync:unstable-${{ env.SHAIRPORT_SYNC_BRANCH }}-airplay1 build-args: | SHAIRPORT_SYNC_BRANCH=${{ env.SHAIRPORT_SYNC_BRANCH }} \ No newline at end of file