chirpstack · Jan 28, 2021 · Jan 28, 2021 · Feb 24, 2021 · Apr 6, 2021 · Apr 6, 2021
diff --git a/.circleci/config.yml b/.circleci/config.yml
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
@@ -0,0 +1 @@
+github: chirpstack
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -0,0 +1,93 @@
+name: CI
+on:
+  push:
+    branches:
+      - '*'
+    tags:
+      - 'v*'
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+      -
+        name: Run tests
+        run: docker compose run --rm chirpstack-gateway-bridge make test
+
+  dist:
+    needs: test
+    runs-on: ubuntu-latest
+    if: startsWith(github.ref, 'refs/tags/v')
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: eu-west-1
+      -
+        name: Build distributable binaries
+        run: docker compose run --rm chirpstack-gateway-bridge make dist
+      -
+        name: Upload binaries to S3
+        if: startsWith(github.ref, 'refs/tags/v')
+        run: |
+          aws s3 sync dist/upload s3://builds.loraserver.io/chirpstack-gateway-bridge
+
+  # Runs on pull request to ensure the docker build works,
+  # but pushes only on commits to master and on PRs.
+  docker:
+    needs: test
+    runs-on: ubuntu-latest
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      -
+        name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v3
+        with:
+          images: |
+            chirpstack/${{ github.event.repository.name }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=semver,pattern={{major}}
+            type=semver,pattern={{major}}.{{minor}}
+      -
+        name: Set up QEMU
+        uses: docker/setup-qemu-action@v1
+      -
+        name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+      -
+        name: Login to DockerHub
+        if: startsWith(github.ref, 'refs/tags/v')
+        uses: docker/login-action@v1 
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      -
+        name: Build and push
+        id: docker_build
+        uses: docker/build-push-action@v2
+        with:
+          platforms: linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6
+          push: ${{ startsWith(github.ref, 'refs/tags/v') }}
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+      -
+        name: Image digest
+        run: echo ${{ steps.docker_build.outputs.digest }}
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -7,22 +7,16 @@ builds:
   - main: cmd/chirpstack-gateway-bridge/main.go
     binary: chirpstack-gateway-bridge
     goos:
-      - windows
-      - darwin
       - linux
     goarch:
       - amd64
-      - 386
       - arm
       - arm64
       - mips
     goarm:
       - 5
       - 6
       - 7
-    ignore:
-      - goos: darwin
-        goarch: 386
     hooks:
       post: ./packaging/scripts/compress-mips.sh
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.15-alpine AS development
+FROM golang:1.22.1-alpine AS development
 
 ENV PROJECT_PATH=/chirpstack-gateway-bridge
 ENV PATH=$PATH:$PROJECT_PATH/build
@@ -14,8 +14,9 @@ WORKDIR $PROJECT_PATH
 RUN make dev-requirements
 RUN make
 
-FROM alpine:3 AS production
+FROM alpine:3.17.0 AS production
 
 RUN apk --no-cache add ca-certificates
 COPY --from=development /chirpstack-gateway-bridge/build/chirpstack-gateway-bridge /usr/bin/chirpstack-gateway-bridge
+USER nobody:nogroup
 ENTRYPOINT ["/usr/bin/chirpstack-gateway-bridge"]
diff --git a/Dockerfile-devel b/Dockerfile-devel
@@ -1,14 +1,15 @@
-FROM golang:1.15-alpine
+FROM golang:1.22.1-alpine
 
 ENV PROJECT_PATH=/chirpstack-gateway-bridge
 ENV PATH=$PATH:$PROJECT_PATH/build
 ENV CGO_ENABLED=0
 ENV GO_EXTRA_BUILD_ARGS="-a -installsuffix cgo"
 
-RUN apk add --no-cache ca-certificates make git bash upx rpm
+RUN apk add --no-cache ca-certificates make git bash upx rpm tar
 
 RUN mkdir -p $PROJECT_PATH
 COPY . $PROJECT_PATH
 WORKDIR $PROJECT_PATH
 
+RUN git config --global --add safe.directory /chirpstack-gateway-bridge
 RUN make dev-requirements
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2019 Orne Brocaar
+Copyright (c) 2022 Orne Brocaar
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/Makefile b/Makefile
@@ -41,4 +41,4 @@ serve: build
 	./build/chirpstack-gateway-bridge
 
 run-compose-test:
-	docker-compose run --rm chirpstack-gateway-bridge make test
+	docker compose run --rm chirpstack-gateway-bridge make test
diff --git a/README.md b/README.md
@@ -1,45 +1,31 @@
 # ChirpStack Gateway Bridge
 
-[![CircleCI](https://circleci.com/gh/brocaar/chirpstack-gateway-bridge.svg?style=svg)](https://circleci.com/gh/brocaar/chirpstack-gateway-bridge)
+![Tests](https://github.com/brocaar/chirpstack-gateway-bridge/actions/workflows/main.yml/badge.svg?branch=master)
 
 ChirpStack Gateway Bridge is a service which converts LoRa<sup>&reg;</sup> Packet Forwarder protocols
-into a ChirpStack Network Server [common data-format](https://github.com/brocaar/chirpstack-api/blob/master/protobuf/gw/gw.proto) (JSON and Protobuf).
-This component is part of the ChirpStack open-source LoRaWAN<sup>&reg;</sup> Network Server stack.
+into a ChirpStack [common data-format](https://github.com/chirpstack/chirpstack/blob/master/api/proto/gw/gw.proto) (JSON and Protobuf).
+This component is part of the ChirpStack open-source LoRaWAN<sup>&reg;</sup> Network Server project.
 
 ## Backends
 
 The following packet-forwarder backends are provided:
 
 * [Semtech UDP packet-forwarder](https://github.com/Lora-net/packet_forwarder)
 * [Basic Station packet-forwarder](https://github.com/lorabasics/basicstation)
+* [ChirpStack Concentratord](https://github.com/brocaar/chirpstack-concentratord/)
 
 ## Integrations
 
 The following integrations are provided:
 
 * Generic MQTT broker
 * [GCP Cloud IoT Core MQTT Bridge](https://cloud.google.com/iot-core/)
+* [Azure IoT Hub](https://azure.microsoft.com/en-us/services/iot-hub/)
 
-## Architecture
+## Documentation
 
-![architecture](https://www.chirpstack.io/static/img/graphs/architecture.dot.png)
-
-### Component links
-
-* [ChirpStack Gateway Bridge](https://www.chirpstack.io/gateway-bridge/)
-* [ChirpStack Network Server](https://www.chirpstack.io/network-server/)
-* [ChirpStack Application Server](https://www.chirpstack.io/application-server/)
-
-## Links
-
-* [Downloads](https://www.chirpstack.io/gateway-bridge/overview/downloads/)
-* [Docker image](https://hub.docker.com/r/chirpstack/chirpstack-gateway-bridge/)
-* [Documentation](https://www.chirpstack.io/gateway-bridge/)
-* [Building from source](https://www.chirpstack.io/gateway-bridge/community/source/)
-* [Contributing](https://www.chirpstack.io/gateway-bridge/community/contribute/)
-* Support
-  * [Community forum](https://forum.chirpstack.io)
-  * [Bug or feature requests](https://github.com/brocaar/chirpstack-gateway-bridge/issues)
+Please refer to the [ChirpStack documentation](https://www.chirpstack.io/) for
+more information.
 
 ## License
 

diff --git a/cmd/chirpstack-gateway-bridge/cmd/configfile.go b/cmd/chirpstack-gateway-bridge/cmd/configfile.go
@@ -14,6 +14,9 @@ const configTemplate = `[general]
 # debug=5, info=4, warning=3, error=2, fatal=1, panic=0
 log_level={{ .General.LogLevel }}
 
+# Log in JSON format.
+log_json={{ .General.LogJSON }}
+
 # Log to syslog.
 #
 # When set to true, log messages are being written to syslog.
@@ -79,25 +82,22 @@ type="{{ .Backend.Type }}"
   # packet-forwarder matches this port.
   udp_bind = "{{ .Backend.SemtechUDP.UDPBind }}"
 
-  # Skip the CRC status-check of received packets
-  #
-  # This is only has effect when the packet-forwarder is configured to forward
-  # LoRa frames with CRC errors.
-  skip_crc_check = {{ .Backend.SemtechUDP.SkipCRCCheck }}
-
   # Fake RX timestamp.
   #
   # Fake the RX time when the gateway does not have GPS, in which case
   # the time would otherwise be unset.
   fake_rx_time={{ .Backend.SemtechUDP.FakeRxTime }}
 
+  # Connection timeout duration
+  #
+  # ChirpStack Gateway Bridge keeps a list of connected gateways. If a gateway does not send any
+  # UDP data within the configured timeout, then ChirpStack Gateway Bridge will consider the gateway
+  # disconnected and it will unsubscribe from the gateway MQTT topic and cleanup the UDP docket. 
+  connection_timeout_duration={{ .Backend.SemtechUDP.CleanupDuration }}
 
   # ChirpStack Concentratord backend.
   [backend.concentratord]
 
-  # Check for CRC OK.
-  crc_check={{ .Backend.Concentratord.CRCCheck }}
-
   # Event API URL.
   event_url="{{ .Backend.Concentratord.EventURL }}"
 
@@ -111,6 +111,12 @@ type="{{ .Backend.Type }}"
   # ip:port to bind the Websocket listener to.
   bind="{{ .Backend.BasicStation.Bind }}"
 
+  # TLS support by a Reverse-Proxy
+  #
+  # When set to true, the websocket listener will use TLS to secure the connections
+  # between the gateways and a reverse-proxy (optional).
+  tls_support_proxy={{ .Backend.BasicStation.TLSSupportProxy }}
+
   # TLS certificate and key files.
   #
   # When set, the websocket listener will use TLS to secure the connections
@@ -133,6 +139,13 @@ type="{{ .Backend.Type }}"
   # Ping interval.
   ping_interval="{{ .Backend.BasicStation.PingInterval }}"
 
+  # Timesync interval.
+  #
+  # This defines the interval in which the ChirpStack Gateway Bridge sends
+  # a timesync request to the gateway. Setting this to 0 disables sending
+  # timesync requests.
+  timesync_interval="{{ .Backend.BasicStation.TimesyncInterval }}"
+
   # Read timeout.
   #
   # This interval must be greater than the configured ping interval.
@@ -213,17 +226,32 @@ type="{{ .Backend.Type }}"
 #
 # This defines how the MQTT payloads are encoded. Valid options are:
 # * protobuf:  Protobuf encoding
-# * json:      JSON encoding (easier for debugging, but less compact than 'protobuf')
+# * json:      JSON encoding (for debugging)
 marshaler="{{ .Integration.Marshaler }}"
 
   # MQTT integration configuration.
   [integration.mqtt]
   # Event topic template.
   event_topic_template="{{ .Integration.MQTT.EventTopicTemplate }}"
 
+  # State topic template.
+  #
+  # States are sent by the gateway as retained MQTT messages (by default)
+  # so that the last message will be stored by the MQTT broker. When set to
+  # a blank string, this feature will be disabled. This feature is only
+  # supported when using the generic authentication type.
+  state_topic_template="{{ .Integration.MQTT.StateTopicTemplate }}"
+
   # Command topic template.
   command_topic_template="{{ .Integration.MQTT.CommandTopicTemplate }}"
 
+  # State retained.
+  #
+  # By default this value is set to true and states are published as retained
+  # MQTT messages. Setting this to false means that states will not be retained
+  # by the MQTT broker.
+  state_retained={{ .Integration.MQTT.StateRetained }}
+
   # Keep alive will set the amount of time (in seconds) that the client should
   # wait before sending a PING request to the broker. This will allow the client
   # to know that a connection has not been lost with the server.