Compare commits

...

10 Commits

Author SHA1 Message Date
c910a12575 Use network mode host for build action.
Some checks failed
Build vzlogger image / Build-and-release-image (push) Failing after 28s
2025-05-06 10:02:08 +00:00
02fa2076c0 Use newer build-push action. 2025-04-30 08:08:07 +00:00
ad26e114b6 Adjust vzlogger middleware configuration. 2025-04-14 10:28:58 +02:00
c15a8caf7e Set permissions for log file. 2025-04-14 09:24:33 +02:00
2153b89fe0 Change user group. 2025-04-14 09:16:36 +02:00
e6fd863d5e Add user before setting permissions. 2025-04-14 09:12:23 +02:00
7c433bb0eb Set permissions for vzlogger configuration. 2025-04-14 09:06:14 +02:00
cbf9d4f671 Copy configuration to correct directory. 2025-04-14 09:01:59 +02:00
9ad5c55610 Try to use directories the right way. 2025-04-14 08:52:15 +02:00
af31d2eae6 Copy directories recursive. 2025-04-14 08:48:10 +02:00
3 changed files with 14 additions and 5 deletions

View File

@@ -21,6 +21,9 @@ jobs:
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
buildkitd-flags: '--allow-insecure-entitlement network.host'
driver-opts: network=host
- name: Login to Docker Hub
uses: docker/login-action@v3
@@ -49,10 +52,12 @@ jobs:
images: ${{ secrets.REGISTRY_URL }}${{ env.IMAGE }}
- name: Build and push Docker image
uses: docker/build-push-action@v4
uses: docker/build-push-action@v6
env:
ACTIONS_RUNTIME_TOKEN: ''
with:
allow: network.host
network: host
tags: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
push: true

View File

@@ -39,7 +39,7 @@ RUN git clone https://github.com/rscada/libmbus.git --depth 1 \
RUN git clone https://github.com/volkszaehler/vzlogger /logger --depth 1
RUN cp /logger/* .
RUN cp -R /logger/. /vzlogger
ARG build_test=off
RUN cmake -DBUILD_TEST=${build_test} \
@@ -73,11 +73,15 @@ RUN apk add --no-cache \
# libsml is linked statically => no need to copy
COPY --from=builder /usr/local/bin/vzlogger /usr/local/bin/vzlogger
COPY --from=builder /usr/local/lib/libmbus.so* /usr/local/lib/
COPY ./vzlogger.conf /cfg
COPY ./vzlogger.conf /etc/vzlogger.conf
# without running a user context, no exec is possible and without the dialout group no access to usb ir reader possible
RUN adduser -S vz -G dialout
RUN chown vz:dialout /etc/vzlogger.conf
RUN touch /var/log/vzlogger.log
RUN chmod a+rw /var/log/vzlogger.log
RUN vzlogger --version
USER vz

View File

@@ -18,12 +18,12 @@
"channels": [
{
"uuid": "ac9dc6a0-dbfc-11ee-8e1d-2bb051f0ef2a", /* UUID von dem angelegten Channel für 1.8.0 */
"middleware": "http://localhost/middleware.php", /* Server Adresse der Middleware, läuft bei uns auf dem RasPi mit */
"middleware": "http://volkszaehler:8080", /* Server Adresse der Middleware */
"identifier": "1-0:1.8.0" /* Die OBIS Kennzahl welche an den Channel gesendet wird - hier Bezug Tarif 1 */
},
{
"uuid": "27260d00-dbfc-11ee-af9d-594b1762c0d0",
"middleware": "http://localhost/middleware.php",
"middleware": "http://volkszaehler:8080",
"identifier": "1-0:16.7.0" /* Aktuelle Leistung */
}
]