Skip to content

Commit

Permalink
Update dsmrreader (#344)
Browse files Browse the repository at this point in the history
* Update to 5.11.0
* Update to Alpine 3.19
  • Loading branch information
goegol authored Feb 22, 2024
1 parent 5b954f3 commit afa7563
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
################################################
Expand Down
5 changes: 5 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions examples/docker-compose.example.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion test_build.sh
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit afa7563

Please sign in to comment.