Skip to content

Feature/maintenance versions #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cybcon merged 2 commits into from
Dec 28, 2025
Merged

Feature/maintenance versions #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e296fd6
upgrade versions
cybcon Dec 28, 2025
ae25cd2
add new version to readme
cybcon Dec 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.20.3
FROM alpine:3.23.2

LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
LABEL site.local.program.version="1.4.0"
LABEL site.local.program.version="1.4.1"

RUN apk upgrade --available --no-cache --update \
&& apk add --no-cache --update \
python3=3.12.7-r0 \
py3-pip=24.0-r2 \
python3=3.12.12-r0 \
py3-pip=25.1.1-r1 \
# Cleanup APK
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

Expand Down
8 changes: 4 additions & 4 deletions Dockerfile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM alpine:3.20.3
FROM alpine:3.23.2

LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
LABEL site.local.program.version="1.4.0"
LABEL site.local.program.version="1.4.1"

RUN apk upgrade --available --no-cache --update \
&& apk add --no-cache --update \
python3=3.12.7-r0 \
py3-pip=24.0-r2 \
python3=3.12.12-r0 \
py3-pip=25.1.1-r1 \
# Cleanup APK
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

Expand Down
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ Container image: [DockerHub](https://hub.docker.com/r/oitc/modbus-server)

# Supported tags and respective `Dockerfile` links

* [`latest`, `1.4.0`](https://github.com/cybcon/modbus-server/blob/v1.4.0/Dockerfile)
* [`latest`, `1.4.1`](https://github.com/cybcon/modbus-server/blob/v1.4.1/Dockerfile)
* [`1.4.0`](https://github.com/cybcon/modbus-server/blob/v1.4.0/Dockerfile)
* [`1.3.2`](https://github.com/cybcon/modbus-server/blob/v1.3.2/Dockerfile)
* [`1.3.1`](https://github.com/cybcon/modbus-server/blob/v1.3.1/Dockerfile)
* [`1.3.0`](https://github.com/cybcon/modbus-server/blob/v1.3.0/Dockerfile)
Expand Down
4 changes: 2 additions & 2 deletions src/app/modbus_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Author: Michael Oberdorf IT-Consulting
Datum: 2020-03-30
Last modified by: Michael Oberdorf
Last modified at: 2024-10-22
Last modified at: 2025-12-28
*************************************************************************** """
import argparse
import json
Expand All @@ -25,7 +25,7 @@

# default configuration file path
default_config_file = "/app/modbus_server.json"
VERSION = "1.4.0"
VERSION = "1.4.1"

log = logging.getLogger()

Expand Down