From afa7563bd7167d07f62bed984ac8d81ca5795f07 Mon Sep 17 00:00:00 2001
From: goegol <info@hans-paulhemelaar.nl>
Date: Thu, 22 Feb 2024 13:59:34 +0100
Subject: [PATCH] Update dsmrreader (#344)

* Update to 5.11.0
* Update to Alpine 3.19
---
 .github/workflows/build_release.yml  | 2 +-
 CHANGELOG                            | 5 +++++
 Dockerfile                           | 4 ++--
 examples/docker-compose.example.yaml | 4 ++--
 test_build.sh                        | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml
index 5bd23cb..d4ed8b7 100644
--- a/.github/workflows/build_release.yml
+++ b/.github/workflows/build_release.yml
@@ -24,7 +24,7 @@ concurrency:
 env:
   DOCKER_TARGET_REPO: xirixiz/dsmr-reader-docker
   DOCKERFILE: Dockerfile
-  DOCKER_TARGET_RELEASE: 2023.11.01
+  DOCKER_TARGET_RELEASE: 2024.02.21
 
 jobs:
   ################################################
diff --git a/CHANGELOG b/CHANGELOG
index d11166c..f234002 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+2024.02.21
+- Upgrade to DSMR 5.11.0
+- Upgrade alpine to 3.19
+- Upgrade postgresql to 15.x
+
 2023.11.01
 - Upgrade to DSMR 5.10.4
 - Upgrade Postgresql client to 15.x
diff --git a/Dockerfile b/Dockerfile
index 8d9a5ff..f870e4c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM python:3-alpine3.18 as staging
+FROM --platform=$BUILDPLATFORM python:3-alpine3.19 as staging
 WORKDIR /app
 
 ARG DSMR_VERSION
@@ -9,7 +9,7 @@ RUN echo "**** Download DSMR ****" \
   && curl -SskLf "https://github.com/dsmrreader/dsmr-reader/archive/refs/tags/v${DSMR_VERSION}.tar.gz" | tar xvzf - --strip-components=1 -C /app \
   && curl -SskLf "https://raw.githubusercontent.com/dsmrreader/dsmr-reader/v5/dsmr_datalogger/scripts/dsmr_datalogger_api_client.py" -o /app/dsmr_datalogger_api_client.py
 
-FROM python:3-alpine3.18
+FROM python:3-alpine3.19
 
 ARG TARGETARCH
 ARG TARGETVARIANT
diff --git a/examples/docker-compose.example.yaml b/examples/docker-compose.example.yaml
index c4406ed..ef8e056 100755
--- a/examples/docker-compose.example.yaml
+++ b/examples/docker-compose.example.yaml
@@ -2,9 +2,9 @@ version: '3'
 
 services:
   dsmrdb:
-    # When using Postgres, release 13.x and 14.x are supported only
+    # When using Postgres, release 13.x, 14.x and 15.x are supported only
     # due to the limited availability of client packages, especially for arm32v7
-    image: postgres:14-alpine
+    image: postgres:15-alpine
     container_name: dsmrdb
     restart: always
     volumes:
diff --git a/test_build.sh b/test_build.sh
index 58d72dc..b295c04 100755
--- a/test_build.sh
+++ b/test_build.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-docker build . --build-arg DSMR_VERSION=5.10.4 --build-arg TARGETARCH="amd64" --build-arg TARGETVARIANT="" --build-arg QEMU_ARCH="x86_64" --build-arg DOCKER_TARGET_RELEASE=2099.09.09 -t dsmr_test_image
+docker build . --build-arg DSMR_VERSION=5.11.0 --build-arg TARGETARCH="amd64" --build-arg TARGETVARIANT="" --build-arg QEMU_ARCH="x86_64" --build-arg DOCKER_TARGET_RELEASE=2099.09.09 -t dsmr_test_image