Skip to content

Commit e6c4f5a

Browse files
authored
Merge pull request #11
wll support
2 parents 9d5a6cb + 512e26b commit e6c4f5a

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

Dockerfile

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN python3 -m venv /home/weewx/weewx-venv \
4343
&& . /home/weewx/weewx-venv/bin/activate \
4444
&& python3 ~/weewx/src/weectl.py station create --no-prompt
4545

46-
COPY conf-fragments/* /home/weewx/tmp/conf-fragments/
46+
COPY conf-fragments/*.conf /home/weewx/tmp/conf-fragments/
4747
RUN mkdir -p /home/weewx/tmp \
4848
&& cat /home/weewx/tmp/conf-fragments/* >> /home/weewx/weewx-data/weewx.conf
4949
## Belchertown extension
@@ -62,7 +62,15 @@ RUN cd /var/tmp \
6262
&& . /home/weewx/weewx-venv/bin/activate \
6363
&& python3 ~/weewx/src/weectl.py extension install -y . \
6464
&& cd /var/tmp \
65-
&& rm -rf weewx-mqtt.zip weewx-mqtt-master
65+
&& rm -rf weewx-mqtt.zip weewx-mqtt-master \
66+
#
67+
## WLL \
68+
&& python3 -m pip install requests \
69+
&& cd /tmp \
70+
&& wget -O WLLDriver.zip https://github.com/Drealine/weatherlinklive-driver-weewx/releases/download/2022.02.27-2/WLLDriver.zip \
71+
&& . /home/weewx/weewx-venv/bin/activate \
72+
&& python3 ~/weewx/src/weectl.py extension install -y WLLDriver.zip \
73+
&& rm -f WLLDriver.zip
6674
#
6775

6876
ADD ./bin/run.sh $WEEWX_ROOT/bin/run.sh

build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
#!/usr/bin/env bash
2-
REV=5
2+
REV=6
33
WEEWX_VERSION=5.1.0
44
IMAGE_VERSION=$WEEWX_VERSION-$REV
5+
#IMAGE_VERSION=latest
56
#docker build --no-cache -t mitct02/weewx:$VERSION .
67
BUILDKIT_COLORS="run=123,20,245:error=yellow:cancel=blue:warning=white" docker buildx build --push --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t mitct02/weewx:$IMAGE_VERSION .
78
#BUILDKIT_COLORS="run=123,20,245:error=yellow:cancel=blue:warning=white" docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 -t mitct02/weewx:$IMAGE_VERSION .

extensions/WLLDriver.zip

15.5 KB
Binary file not shown.

0 commit comments

Comments
 (0)