From 67e5c7e20ec2720a89c34e79c0281c7b3b5a0e8e Mon Sep 17 00:00:00 2001 From: Ross Stewart Date: Mon, 8 Sep 2025 16:27:31 +0100 Subject: [PATCH] - Update Alpine version for Docker container to v3.22.1 - Updated GH Actions script to cross-compile amd64 and arm64 images - Updated GH Actions modules to latest versions - Bumped version number in app.py --- .github/workflows/build_image.yml | 9 +++++---- Dockerfile | 7 ++++--- skill/app.py | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml index 87c9d2b..c6489b4 100644 --- a/.github/workflows/build_image.yml +++ b/.github/workflows/build_image.yml @@ -18,10 +18,10 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v3 + uses: actions/checkout@v5.0.0 - name: Log in to the Container registry - uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9 + uses: docker/login-action@v3.5.0 with: registry: ${{ env.REGISTRY }} username: ${{ github.actor }} @@ -29,14 +29,15 @@ jobs: - name: Extract metadata (tags, labels) for Docker id: meta - uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38 + uses: docker/metadata-action@v5.8.0 with: images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} - name: Build and push Docker image - uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc + uses: docker/build-push-action@v6.18.0 with: context: . + platforms: linux/amd64, linux/arm64 push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index ee4145a..c99d2eb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ -FROM alpine:3.15.0 as build +FROM alpine:3.22.1 AS build LABEL maintainer="Ross Stewart " -LABEL org.opencontainers.image.source https://github.com/rosskouk/asknavidrome +LABEL org.opencontainers.image.source=https://github.com/rosskouk/asknavidrome RUN apk add python3 py3-pip git build-base python3-dev libffi-dev openssl-dev @@ -15,8 +15,9 @@ WORKDIR /opt/asknavidrome RUN source ../env/bin/activate && pip --no-cache-dir install wheel && pip --no-cache-dir install -r skill/requirements-docker.txt -FROM alpine:3.15.0 +FROM alpine:3.22.1 LABEL maintainer="Ross Stewart " +LABEL org.opencontainers.image.source=https://github.com/rosskouk/asknavidrome RUN apk add python3 diff --git a/skill/app.py b/skill/app.py index 798e896..5eda679 100755 --- a/skill/app.py +++ b/skill/app.py @@ -42,7 +42,7 @@ logger.addHandler(handler) # Get service configuration # -logger.info('AskNavidrome 0.6!') +logger.info('AskNavidrome 0.9!') logger.debug('Getting configuration from the environment...') try: