Merge pull request #10 from waggle-sensor/switch-device-templates

Periodic pull and update device templates

Author: FranciscoLozCoding

Dockerfile

@@ -1,16 +1,30 @@
+# If you migrate to chirpstack=>4.7v, a migration needs to be done
+#check this: https://www.chirpstack.io/docs/chirpstack/changelog.html#v470
 FROM chirpstack/chirpstack:4.6
 
-ENV TTN_REPO=https://github.com/TheThingsNetwork/lorawan-devices
-ENV TTN_VERSION=277e69a79347ceba2593e1da08117d0e3329ecda
+ENV DEVICE_TEMPLATES_REPO=https://github.com/waggle-sensor/wes-lorawan-device-templates
+ENV TARGET_DIR=/opt/lorawan-devices
 
 USER root
 
-RUN apk update && apk add --no-cache git
+# Install packages
+RUN apk update && apk add --no-cache git bash sudo
 
-RUN git clone ${TTN_REPO} -b master --single-branch /opt/lorawan-devices ; \
-    cd /opt/lorawan-devices ; \
-    git checkout ${TTN_VERSION} ; \
-    rm -rf .git
+# clone DEVICE_TEMPLATES_REPO 
+RUN git clone ${DEVICE_TEMPLATES_REPO} -b master --single-branch ${TARGET_DIR}
+
+# Copy script into the container
+COPY device-templates.sh /usr/local/bin/device-templates.sh
+
+# add crond to be used with sudo by nobody user & 
+# add global env vars to be used in cron & 
+# Set permissions &
+# Set up cron job
+RUN echo 'nobody ALL=(ALL) NOPASSWD: /usr/sbin/crond' > /etc/sudoers && \
+    printenv > /etc/environment && \
+    chown -R nobody:nogroup ${TARGET_DIR} /etc/environment && \
+    chmod 755 /usr/local/bin/device-templates.sh && \
+    echo '0 * * * * /usr/local/bin/device-templates.sh' > /etc/crontabs/root
 
 # restore the running as `nobody` as is defined by chirpstack docker image
 USER nobody:nogroup

README.md

@@ -1,10 +1,8 @@
 # Waggle Edge Stack Chirpstack Application Server
 
-This is an extension of the [Chirpstack Appliction Server (v4)](https://www.chirpstack.io/docs/chirpstack/changelog.html) adding [The Things Network LoRaWAN device profile templates](https://github.com/TheThingsNetwork/lorawan-devices).
+This is an extension of the [Chirpstack Appliction Server (v4)](https://www.chirpstack.io/docs/chirpstack/changelog.html) adding [Waggle's LoRaWAN device profile templates](https://github.com/waggle-sensor/wes-lorawan-device-templates).
 
-This project simply clones the The Things Network LoRaWAN github repository into the Chirpstack application server Docker image, allowing for the LoRaWAN device profiles to be imported.
-
-> Note: the specific version chosen of the [The Things Network LoRaWAN device profile templates](https://github.com/TheThingsNetwork/lorawan-devices) was the last version that had `Apache License 2.0`. Newer version cannot be replicated. You are, however, permitted to reuse or extract information about an individual end device. 
+This project clones our LoRaWAN device profile templates into the Chirpstack application server Docker image, allowing for the LoRaWAN device profiles to be periodically pulled and imported to chirpstack.
 
 References:
 - https://www.chirpstack.io/docs/chirpstack/use/device-profile-templates.html

device-templates.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -l
+
+# Clone or update the repository
+if [ ! -d "$TARGET_DIR" ]; then
+  echo "device-templates: Cloning repository $DEVICE_TEMPLATES_REPO to $TARGET_DIR"
+  git clone "$DEVICE_TEMPLATES_REPO" -b master --single-branch "$TARGET_DIR"
+else
+  echo "device-templates: Updating repository in $TARGET_DIR"
+  cd "$TARGET_DIR"
+  git pull
+fi
+
+# Run the Chirpstack command to import device templates
+echo "device-templates: Running Chirpstack import device-templates command"
+chirpstack -c /etc/chirpstack-waggle import-legacy-lorawan-devices-repository -d "$TARGET_DIR"