diff --git a/.github/workflows/codecov.yml b/.github/workflows/codecov.yml index 9062c198f..6871305ae 100644 --- a/.github/workflows/codecov.yml +++ b/.github/workflows/codecov.yml @@ -15,7 +15,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.23.1" + go-version: "1.23.4" - name: Install pcap run: sudo apt-get install libpcap-dev - name: Run coverage diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml index 4dfd55f6c..42936eeb1 100644 --- a/.github/workflows/golangci-lint.yml +++ b/.github/workflows/golangci-lint.yml @@ -16,7 +16,7 @@ jobs: steps: - uses: actions/setup-go@v5 with: - go-version: 1.23.1 + go-version: 1.23.4 - name: Install pcap run: sudo apt-get install libpcap-dev - uses: actions/checkout@v4 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 42eeff135..f2808b020 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -24,7 +24,7 @@ jobs: - uses: actions/checkout@v4 - uses: actions/setup-go@v5 with: - go-version: "1.23.1" + go-version: "1.23.4" - name: set version run: | echo "VERSION=$(echo "${{inputs.tag_name}}" | cut -d '-' -f1)" >> "$GITHUB_ENV" diff --git a/Makefile b/Makefile index 62a191d44..7d041b204 100644 --- a/Makefile +++ b/Makefile @@ -62,7 +62,7 @@ buildx-push-image-deviceshifu-http-opcua: -t edgehub/deviceshifu-http-opcua:${IMAGE_VERSION} --push buildx-push-image-deviceshifu-http-plc4x: - docker buildx build --platform=linux/amd64 -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X \ + docker buildx build --platform=linux/amd64,linux/arm64 -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.deviceshifuPLC4X \ --build-arg PROJECT_ROOT="${PROJECT_ROOT}" ${PROJECT_ROOT} \ -t edgehub/deviceshifu-http-plc4x:${IMAGE_VERSION} --push @@ -136,7 +136,9 @@ buildx-push-image-deviceshifu: \ buildx-push-image-deviceshifu-http-socket \ buildx-push-image-deviceshifu-http-opcua \ buildx-push-image-deviceshifu-http-plc4x \ - buildx-push-image-deviceshifu-tcp-tcp + buildx-push-image-deviceshifu-tcp-tcp \ + buildx-push-image-deviceshifu-http-lwm2m \ + buildx-push-image-gateway-lwm2m buildx-push-image-telemetry-service: docker buildx build --platform=linux/amd64,linux/arm64,linux/arm -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.telemetryservice \ @@ -231,7 +233,9 @@ buildx-build-image-deviceshifu: \ buildx-build-image-deviceshifu-http-socket \ buildx-build-image-deviceshifu-http-opcua \ buildx-build-image-deviceshifu-http-plc4x \ - buildx-build-image-deviceshifu-tcp-tcp + buildx-build-image-deviceshifu-tcp-tcp \ + buildx-build-image-deviceshifu-http-lwm2m \ + buildx-build-image-gateway-lwm2m buildx-build-image-telemetry-service: docker buildx build --platform=linux/$(shell go env GOARCH) -f ${PROJECT_ROOT}/dockerfiles/Dockerfile.telemetryservice\ diff --git a/azure-pipelines/azure-pipelines.yml b/azure-pipelines/azure-pipelines.yml index 2a7cd7b48..14389f752 100644 --- a/azure-pipelines/azure-pipelines.yml +++ b/azure-pipelines/azure-pipelines.yml @@ -36,7 +36,7 @@ variables: - name: tag value: "" - name: goVersion - value: "1.23.1" + value: "1.23.4" pool: vmImage: "ubuntu-latest" diff --git a/dockerfiles/Dockerfile.deviceshifuHTTP b/dockerfiles/Dockerfile.deviceshifuHTTP index ba43b0a98..7293a2dba 100644 --- a/dockerfiles/Dockerfile.deviceshifuHTTP +++ b/dockerfiles/Dockerfile.deviceshifuHTTP @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuLwM2M b/dockerfiles/Dockerfile.deviceshifuLwM2M index cd2e1d2dd..c5aa8e91c 100644 --- a/dockerfiles/Dockerfile.deviceshifuLwM2M +++ b/dockerfiles/Dockerfile.deviceshifuLwM2M @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 as builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 as builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuMQTT b/dockerfiles/Dockerfile.deviceshifuMQTT index d76990fa0..1dbf7b0f5 100644 --- a/dockerfiles/Dockerfile.deviceshifuMQTT +++ b/dockerfiles/Dockerfile.deviceshifuMQTT @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuOPCUA b/dockerfiles/Dockerfile.deviceshifuOPCUA index 8973587d5..80d672102 100644 --- a/dockerfiles/Dockerfile.deviceshifuOPCUA +++ b/dockerfiles/Dockerfile.deviceshifuOPCUA @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuPLC4X b/dockerfiles/Dockerfile.deviceshifuPLC4X index 4d2412aca..5bee904e3 100644 --- a/dockerfiles/Dockerfile.deviceshifuPLC4X +++ b/dockerfiles/Dockerfile.deviceshifuPLC4X @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.23.1-alpine AS builder +FROM golang:1.23.4-alpine AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuSocket b/dockerfiles/Dockerfile.deviceshifuSocket index cfb145e61..c0507aacb 100644 --- a/dockerfiles/Dockerfile.deviceshifuSocket +++ b/dockerfiles/Dockerfile.deviceshifuSocket @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.deviceshifuTCP b/dockerfiles/Dockerfile.deviceshifuTCP index e5277871b..a6466df73 100644 --- a/dockerfiles/Dockerfile.deviceshifuTCP +++ b/dockerfiles/Dockerfile.deviceshifuTCP @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.gatewayLwM2M b/dockerfiles/Dockerfile.gatewayLwM2M index b6d4ddfe6..b95f45729 100644 --- a/dockerfiles/Dockerfile.gatewayLwM2M +++ b/dockerfiles/Dockerfile.gatewayLwM2M @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 as builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 as builder WORKDIR /shifu diff --git a/dockerfiles/Dockerfile.telemetryservice b/dockerfiles/Dockerfile.telemetryservice index 556ec0bc1..8d78f320b 100644 --- a/dockerfiles/Dockerfile.telemetryservice +++ b/dockerfiles/Dockerfile.telemetryservice @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/customized/humidity_detector/Dockerfile b/examples/deviceshifu/customized/humidity_detector/Dockerfile index 803816fec..ed89acf41 100644 --- a/examples/deviceshifu/customized/humidity_detector/Dockerfile +++ b/examples/deviceshifu/customized/humidity_detector/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1-alpine AS builder +FROM golang:1.23.4-alpine AS builder WORKDIR /humidity-detector COPY humidity-detector.go ./ RUN go mod init humidity-detector diff --git a/examples/deviceshifu/customized/humidity_detector/mockserver/Dockerfile b/examples/deviceshifu/customized/humidity_detector/mockserver/Dockerfile index af8f08d86..6230a428e 100644 --- a/examples/deviceshifu/customized/humidity_detector/mockserver/Dockerfile +++ b/examples/deviceshifu/customized/humidity_detector/mockserver/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.23.1-alpine AS builder +FROM golang:1.23.4-alpine AS builder WORKDIR /mockserver COPY *.go ./ RUN go mod init mockserver diff --git a/examples/deviceshifu/customized/humidity_detector/sample_deviceshifu_dockerfiles/Dockerfile.deviceshifuHTTP-Python b/examples/deviceshifu/customized/humidity_detector/sample_deviceshifu_dockerfiles/Dockerfile.deviceshifuHTTP-Python index 31e3a859c..1a27778d9 100644 --- a/examples/deviceshifu/customized/humidity_detector/sample_deviceshifu_dockerfiles/Dockerfile.deviceshifuHTTP-Python +++ b/examples/deviceshifu/customized/humidity_detector/sample_deviceshifu_dockerfiles/Dockerfile.deviceshifuHTTP-Python @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/hello-world-device/Dockerfile b/examples/deviceshifu/hello-world-device/Dockerfile index 8a2b31eeb..3c46aadb4 100644 --- a/examples/deviceshifu/hello-world-device/Dockerfile +++ b/examples/deviceshifu/hello-world-device/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM golang:1.23.1-alpine +FROM golang:1.23.4-alpine WORKDIR /app COPY go.mod ./ RUN go mod download diff --git a/examples/deviceshifu/high-temperature-detector-application/Dockerfile b/examples/deviceshifu/high-temperature-detector-application/Dockerfile index e23079922..fee23b250 100644 --- a/examples/deviceshifu/high-temperature-detector-application/Dockerfile +++ b/examples/deviceshifu/high-temperature-detector-application/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM golang:1.23.1-alpine +FROM golang:1.23.4-alpine WORKDIR /app COPY go.mod ./ RUN go mod download diff --git a/examples/deviceshifu/mockdevice/agv/Dockerfile.mockdevice-agv b/examples/deviceshifu/mockdevice/agv/Dockerfile.mockdevice-agv index 6baac55e5..592368199 100644 --- a/examples/deviceshifu/mockdevice/agv/Dockerfile.mockdevice-agv +++ b/examples/deviceshifu/mockdevice/agv/Dockerfile.mockdevice-agv @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/mockdevice/plate-reader/Dockerfile.mockdevice-plate-reader b/examples/deviceshifu/mockdevice/plate-reader/Dockerfile.mockdevice-plate-reader index 083fd9fae..324d1716f 100644 --- a/examples/deviceshifu/mockdevice/plate-reader/Dockerfile.mockdevice-plate-reader +++ b/examples/deviceshifu/mockdevice/plate-reader/Dockerfile.mockdevice-plate-reader @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/mockdevice/plc/Dockerfile.mockdevice-plc b/examples/deviceshifu/mockdevice/plc/Dockerfile.mockdevice-plc index fe2bf4796..e11ea351e 100644 --- a/examples/deviceshifu/mockdevice/plc/Dockerfile.mockdevice-plc +++ b/examples/deviceshifu/mockdevice/plc/Dockerfile.mockdevice-plc @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/mockdevice/robot-arm/Dockerfile.mockdevice-robot-arm b/examples/deviceshifu/mockdevice/robot-arm/Dockerfile.mockdevice-robot-arm index 402d7be11..541ecf80b 100644 --- a/examples/deviceshifu/mockdevice/robot-arm/Dockerfile.mockdevice-robot-arm +++ b/examples/deviceshifu/mockdevice/robot-arm/Dockerfile.mockdevice-robot-arm @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/deviceshifu/mockdevice/socket/Dockerfile.mockdevice-socket b/examples/deviceshifu/mockdevice/socket/Dockerfile.mockdevice-socket index a16e3b63e..6902c701f 100644 --- a/examples/deviceshifu/mockdevice/socket/Dockerfile.mockdevice-socket +++ b/examples/deviceshifu/mockdevice/socket/Dockerfile.mockdevice-socket @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu ENV GO111MODULE=on diff --git a/examples/deviceshifu/mockdevice/thermometer/Dockerfile.mockdevice-thermometer b/examples/deviceshifu/mockdevice/thermometer/Dockerfile.mockdevice-thermometer index 9d80194d3..ab204fd15 100644 --- a/examples/deviceshifu/mockdevice/thermometer/Dockerfile.mockdevice-thermometer +++ b/examples/deviceshifu/mockdevice/thermometer/Dockerfile.mockdevice-thermometer @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /shifu diff --git a/examples/driver_utils/simple-alpine/Dockerfile.sample b/examples/driver_utils/simple-alpine/Dockerfile.sample index c82a00117..89921ba1c 100644 --- a/examples/driver_utils/simple-alpine/Dockerfile.sample +++ b/examples/driver_utils/simple-alpine/Dockerfile.sample @@ -1,4 +1,4 @@ -FROM golang:1.23.1 AS builder +FROM golang:1.23.4 AS builder WORKDIR / diff --git a/examples/telemetryservice/mockclient/Dockerfile.mockclient b/examples/telemetryservice/mockclient/Dockerfile.mockclient index 5f6cbc455..ee427a5be 100644 --- a/examples/telemetryservice/mockclient/Dockerfile.mockclient +++ b/examples/telemetryservice/mockclient/Dockerfile.mockclient @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /mockclient diff --git a/examples/telemetryservice/mockserver/Dockerfile.mockserver b/examples/telemetryservice/mockserver/Dockerfile.mockserver index 545617d92..e89ad5d72 100644 --- a/examples/telemetryservice/mockserver/Dockerfile.mockserver +++ b/examples/telemetryservice/mockserver/Dockerfile.mockserver @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder WORKDIR /mockserver diff --git a/go.mod b/go.mod index cda969d76..59a3b918d 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/edgenesis/shifu -go 1.23.1 +go 1.23.4 require ( github.com/apache/plc4x/plc4go v0.0.0-20220929155823-14e7d8450c87 diff --git a/pkg/k8s/crd/Dockerfile b/pkg/k8s/crd/Dockerfile index 930ce77c5..b09b3435c 100644 --- a/pkg/k8s/crd/Dockerfile +++ b/pkg/k8s/crd/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM --platform=$BUILDPLATFORM golang:1.23.1 AS builder +FROM --platform=$BUILDPLATFORM golang:1.23.4 AS builder ENV GO111MODULE=on ENV GOPRIVATE=github.com/Edgenesis