Compare commits
10 Commits
c2c241fbbf
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| c910a12575 | |||
| 02fa2076c0 | |||
| ad26e114b6 | |||
| c15a8caf7e | |||
| 2153b89fe0 | |||
| e6fd863d5e | |||
| 7c433bb0eb | |||
| cbf9d4f671 | |||
| 9ad5c55610 | |||
| af31d2eae6 |
@@ -21,6 +21,9 @@ jobs:
|
|||||||
steps:
|
steps:
|
||||||
- name: Set up Docker Buildx
|
- name: Set up Docker Buildx
|
||||||
uses: docker/setup-buildx-action@v2
|
uses: docker/setup-buildx-action@v2
|
||||||
|
with:
|
||||||
|
buildkitd-flags: '--allow-insecure-entitlement network.host'
|
||||||
|
driver-opts: network=host
|
||||||
|
|
||||||
- name: Login to Docker Hub
|
- name: Login to Docker Hub
|
||||||
uses: docker/login-action@v3
|
uses: docker/login-action@v3
|
||||||
@@ -49,10 +52,12 @@ jobs:
|
|||||||
images: ${{ secrets.REGISTRY_URL }}${{ env.IMAGE }}
|
images: ${{ secrets.REGISTRY_URL }}${{ env.IMAGE }}
|
||||||
|
|
||||||
- name: Build and push Docker image
|
- name: Build and push Docker image
|
||||||
uses: docker/build-push-action@v4
|
uses: docker/build-push-action@v6
|
||||||
env:
|
env:
|
||||||
ACTIONS_RUNTIME_TOKEN: ''
|
ACTIONS_RUNTIME_TOKEN: ''
|
||||||
with:
|
with:
|
||||||
|
allow: network.host
|
||||||
|
network: host
|
||||||
tags: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
|
tags: ${{ vars.LOCAL_REGISTRY_URL }}${{ env.IMAGE }}:latest
|
||||||
push: true
|
push: true
|
||||||
|
|
||||||
|
|||||||
@@ -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 git clone https://github.com/volkszaehler/vzlogger /logger --depth 1
|
||||||
|
|
||||||
RUN cp /logger/* .
|
RUN cp -R /logger/. /vzlogger
|
||||||
|
|
||||||
ARG build_test=off
|
ARG build_test=off
|
||||||
RUN cmake -DBUILD_TEST=${build_test} \
|
RUN cmake -DBUILD_TEST=${build_test} \
|
||||||
@@ -73,11 +73,15 @@ RUN apk add --no-cache \
|
|||||||
# libsml is linked statically => no need to copy
|
# libsml is linked statically => no need to copy
|
||||||
COPY --from=builder /usr/local/bin/vzlogger /usr/local/bin/vzlogger
|
COPY --from=builder /usr/local/bin/vzlogger /usr/local/bin/vzlogger
|
||||||
COPY --from=builder /usr/local/lib/libmbus.so* /usr/local/lib/
|
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
|
# 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 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
|
RUN vzlogger --version
|
||||||
|
|
||||||
USER vz
|
USER vz
|
||||||
|
|||||||
@@ -18,12 +18,12 @@
|
|||||||
"channels": [
|
"channels": [
|
||||||
{
|
{
|
||||||
"uuid": "ac9dc6a0-dbfc-11ee-8e1d-2bb051f0ef2a", /* UUID von dem angelegten Channel für 1.8.0 */
|
"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 */
|
"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",
|
"uuid": "27260d00-dbfc-11ee-af9d-594b1762c0d0",
|
||||||
"middleware": "http://localhost/middleware.php",
|
"middleware": "http://volkszaehler:8080",
|
||||||
"identifier": "1-0:16.7.0" /* Aktuelle Leistung */
|
"identifier": "1-0:16.7.0" /* Aktuelle Leistung */
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user