Skip to content

maintain versions #23

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 1 commit into from
Dec 28, 2025
Merged

maintain versions #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM alpine:3.21.0 AS base
FROM alpine:3.23.2 AS base
RUN apk upgrade --available --no-cache --update \
&& apk add --no-cache --update \
python3=3.12.8-r1 \
py3-pip=24.3.1-r0 \
python3=3.12.12-r0 \
py3-pip=25.1.1-r1 \
# Cleanup APK
&& rm -rf /var/cache/apk/* /tmp/* /var/tmp/*

Expand All @@ -11,8 +11,8 @@ RUN apk upgrade --available --no-cache --update \
# Compiling python modules
FROM base AS builder
RUN apk add --no-cache --update \
g++=14.2.0-r4 \
python3-dev=3.12.8-r1 \
g++=15.2.0-r2 \
python3-dev=3.12.12-r0 \
&& ln -s /usr/include/locale.h /usr/include/xlocale.h
COPY --chown=root:root FloatToHex /FloatToHex

Expand All @@ -26,14 +26,14 @@ RUN python3 setup.py install
# Building the docker image with already compiled modules
FROM base
LABEL maintainer="Michael Oberdorf IT-Consulting <info@oberdorf-itc.de>"
LABEL site.local.program.version="1.0.16"
LABEL site.local.program.version="1.0.17"

COPY --from=builder /usr/lib/python3.12/site-packages /usr/lib/python3.12/site-packages

RUN apk add --no-cache --update \
libstdc++=14.2.0-r4 \
py3-wheel=0.43.0-r0 \
py3-pandas=2.2.3-r0
libstdc++=15.2.0-r2 \
py3-wheel=0.46.1-r0 \
py3-pandas=2.3.3-r0

COPY --chown=root:root /src /

Expand Down
2 changes: 1 addition & 1 deletion LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2020-2024 Michael Oberdorf IT-Consulting
Copyright (c) 2020-2025 Michael Oberdorf IT-Consulting

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
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 @@ -24,7 +24,8 @@ Container Registry: [DockerHub](https://hub.docker.com/r/oitc/modbus-client)

# Supported tags and respective `Dockerfile` links

* [`latest`, `1.0.16`](https://github.com/cybcon/modbus-client/blob/v1.0.16/Dockerfile)
* [`latest`, `1.0.17`](https://github.com/cybcon/modbus-client/blob/v1.0.17/Dockerfile)
* [`1.0.16`](https://github.com/cybcon/modbus-client/blob/v1.0.16/Dockerfile)
* [`1.0.15`](https://github.com/cybcon/modbus-client/blob/v1.0.15/Dockerfile)
* [`1.0.14`](https://github.com/cybcon/modbus-client/blob/v1.0.14/Dockerfile)
* [`1.0.13`](https://github.com/cybcon/modbus-client/blob/v1.0.13/Dockerfile)
Expand Down
4 changes: 2 additions & 2 deletions src/app/modbus_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
# Author: Michael Oberdorf IT-Consulting
# Datum: 2020-05-20
# Last modified by: Michael Oberdorf
# Last modified at: 2024-12-23
# Last modified at: 2025-12-28
###############################################################################
"""
import argparse
Expand All @@ -17,7 +17,7 @@

import FloatToHex

VERSION = "1.0.16"
VERSION = "1.0.17"
DEBUG = False
"""
###############################################################################
Expand Down
Loading