From 24328e66d956291ffab9fb71ed1e6aee1e79769f Mon Sep 17 00:00:00 2001 From: KF7EEL Date: Sun, 25 Sep 2022 12:47:44 -0700 Subject: [PATCH] download radioid.nt json as part of build process --- Dockerfile.data_gateway | 6 +++++- Dockerfile.hbnet | 7 ++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Dockerfile.data_gateway b/Dockerfile.data_gateway index 19e1c74..50edb7c 100644 --- a/Dockerfile.data_gateway +++ b/Dockerfile.data_gateway @@ -21,10 +21,14 @@ COPY LICENSE.txt . COPY data_gateway.py . COPY docker/data_gateway/data_gateway.cfg ./config/ #Install Python3.9 and dependencies -RUN apt-get -y update; apt-get -y upgrade; apt-get -y install --no-install-recommends python3.9-dev python3-pip python3.9 build-essential net-tools iputils-ping; apt-get clean; rm -rf /var/lib/apt/lists/* +RUN apt-get -y update; apt-get -y upgrade; apt-get -y install --no-install-recommends python3.9-dev python3-pip python3.9 build-essential net-tools iputils-ping wget; apt-get clean; rm -rf /var/lib/apt/lists/* RUN mkdir -p /opt/hbnet_data_gateway/log/ +RUN wget https://radioid.net/static/users.json -o /opt/hbnet_data_gateway/subscriber_ids.json + +RUN wget https://www.radioid.net/static/rptrs.json -o /opt/hbnet_data_gateway/peer_ids.json + RUN chown -R hbnet:hbnet /opt/hbnet_data_gateway/ # Switch user and install dependencies diff --git a/Dockerfile.hbnet b/Dockerfile.hbnet index 2a68a07..5588047 100644 --- a/Dockerfile.hbnet +++ b/Dockerfile.hbnet @@ -25,7 +25,12 @@ COPY docker/hbnet/hbnet.cfg ./config/ COPY docker/hbnet/rules.py ./config/ COPY hotspot_proxy_v2.py . #Install Python3.9 and dependencies -RUN apt-get -y update; apt-get -y upgrade; apt-get -y install --no-install-recommends python3.9-dev python3-pip python3.9 build-essential net-tools iputils-ping; apt-get clean; rm -rf /var/lib/apt/lists/* +RUN apt-get -y update; apt-get -y upgrade; apt-get -y install --no-install-recommends python3.9-dev python3-pip python3.9 build-essential net-tools iputils-ping wget; apt-get clean; rm -rf /var/lib/apt/lists/* + +RUN wget https://radioid.net/static/users.json -o /opt/hbnet/subscriber_ids.json + +RUN wget https://www.radioid.net/static/rptrs.json -o /opt/hbnet/peer_ids.json + RUN chown -R hbnet:hbnet /opt/hbnet/