Cleanup and build updates

sanderdw · Apr 15, 2024 · 0d36d67 · 0d36d67
1 parent 3193e68
commit 0d36d67
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 24 deletions.
diff --git a/.github/workflows/dsmr-reader.yml b/.github/workflows/dsmr-reader.yml
@@ -23,35 +23,35 @@ jobs:
           # AMD64
           - DOCKER_TAG_SUFFIX: amd64
             S6_ARCH: amd64
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:development
+            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
             PLATFORMS: linux/amd64
             QEMU_ARCH: x86_64
 
           # ARM32V6
           - DOCKER_TAG_SUFFIX: armhf
             S6_ARCH: armhf
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:development
+            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
             PLATFORMS: linux/arm/v6
             QEMU_ARCH: arm
 
           # ARM32V7
           - DOCKER_TAG_SUFFIX: armv7
             S6_ARCH: armv7
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:development
+            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
             PLATFORMS: linux/arm/v7
             QEMU_ARCH: arm
 
           # ARM64V8
           - DOCKER_TAG_SUFFIX: aarch64
             S6_ARCH: aarch64
-            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:development
+            BASE_IMAGE: ghcr.io/xirixiz/dsmr-reader-docker:5.11.0-2024.04.01
             PLATFORMS: linux/arm64/v8
             QEMU_ARCH: aarch64
 
     steps:
       # Get the repository's code
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       # https://github.com/docker/setup-qemu-action
       - name: Get the version from config.json
         id: data
@@ -61,20 +61,20 @@ jobs:
       - name: DSMR addon release
         run: echo ${{ steps.data.outputs.HA_RELEASE }}
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
       - name: Login to Docker Hub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Docker meta
         id: meta # you'll use this in the next step
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           # list of Docker images to use as base name for tags
           images: |
@@ -89,7 +89,7 @@ jobs:
             type=semver,pattern={{major}}
             type=raw,value=${{ steps.data.outputs.HA_RELEASE }}
       - name: Build and push
-        uses: docker/build-push-action@v4
+        uses: docker/build-push-action@v5
         with:
           context: ./dsmr_reader
           platforms: ${{ matrix.PLATFORMS }}

diff --git a/dsmr_reader/Dockerfile b/dsmr_reader/Dockerfile
@@ -7,20 +7,6 @@ ENV LANG C.UTF-8
 
 RUN apk add --no-cache jq
 
-# Add bashio
-#RUN \
-#    curl -J -L -o /tmp/bashio.tar.gz \
-#        "https://github.com/hassio-addons/bashio/archive/v0.14.3.tar.gz" \
-#    && mkdir /tmp/bashio \
-#    && tar zxvf \
-#        /tmp/bashio.tar.gz \
-#        --strip 1 -C /tmp/bashio \
-#    \
-#    && mv /tmp/bashio/lib /usr/lib/bashio \
-#    && ln -s /usr/lib/bashio/bashio /usr/bin/bashio \
-#    && rm -f -r \
-#        /tmp/*
-
 RUN \
     mkdir -p /usr/src/bashio \
     && curl -L -f -s "https://github.com/hassio-addons/bashio/archive/v0.16.2.tar.gz" \