From e127be562d8139d27885239f596dfe5c4d757001 Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Sun, 23 Jan 2022 23:12:03 +0000 Subject: [PATCH 1/8] Create Dockerfile Add Dockerfile --- Dockerfile | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..9a0d22e --- /dev/null +++ b/Dockerfile @@ -0,0 +1,17 @@ +FROM python:3.9-alpine + +COPY entrypoint /entrypoint + +RUN adduser -D -u 54000 radio && \ + apk update && \ + apk add git gcc musl-dev && \ + cd /opt && \ + git clone https://github.com/ShaYmez/hblink3 && \ + cd /opt/hblink3 && \ + pip install --no-cache-dir -r requirements.txt && \ + apk del git gcc musl-dev && \ + chown -R radio: /opt/hblink3 + +USER radio + +ENTRYPOINT [ "/entrypoint" ] From bc9eeeb0d6e9034e399dee2366669765bfcca51c Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Sun, 23 Jan 2022 23:22:54 +0000 Subject: [PATCH 2/8] Update requirements.txt update requirements.txt --- requirements.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3d17f35..910b5d3 100755 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ -bitstring>=3.1.5 -bitarray>=0.8.1 -Twisted>=16.3.0 -dmr_utils3>=0.1.19 -configparser>=3.0.0 +bitstring>=3.1.9 +bitarray>=2.3.5 +Twisted>=21.7.0 +dmr_utils3>=0.1.29 +configparser>=5.2.0 From ea5a67ae88df002274b159a7ad1ff456055770dd Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Sun, 23 Jan 2022 23:38:08 +0000 Subject: [PATCH 3/8] Create entrypoint add entrypoint --- entrypoint | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 entrypoint diff --git a/entrypoint b/entrypoint new file mode 100644 index 0000000..fceef72 --- /dev/null +++ b/entrypoint @@ -0,0 +1,4 @@ +#!/bin/sh + +cd /opt/hblink3 +python /opt/hblink3/bridge.py -c hblink.cfg -r rules.py From f01d88bd632068538232da5c57938f52a00818dd Mon Sep 17 00:00:00 2001 From: ShaYmez Date: Sun, 23 Jan 2022 23:45:38 +0000 Subject: [PATCH 4/8] Set permissions --- Dockerfile | 0 entrypoint | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 entrypoint diff --git a/Dockerfile b/Dockerfile old mode 100644 new mode 100755 diff --git a/entrypoint b/entrypoint old mode 100644 new mode 100755 From a691c6e05faeb0e5f6e1b78388fe53787d74424b Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Mon, 24 Jan 2022 00:26:42 +0000 Subject: [PATCH 5/8] Create docker-compose.yml Add docker-compose --- docker-compose.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..cb7e746 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3.3' +services: + hblink3: + container_name: hblink + volumes: + - '/etc/hblink3/hblink.cfg:/opt/hblink3/hblink.cfg' + - '/var/log/hblink/hblink.log:/opt/hblink3/hblink.log' + - '/etc/hblink3/rules.py:/opt/hblink3/rules.py' + ports: + - '62030:62030/udp' + - '62031-62051:62031-62051/udp' + - '4321:4321/tcp' + image: 'shaymez/hblink3:latest' + restart: "unless-stopped" From fb3956a6489582b149b9d48f40eb6d3ed008a770 Mon Sep 17 00:00:00 2001 From: ShaYmez Date: Mon, 24 Jan 2022 00:28:47 +0000 Subject: [PATCH 6/8] Set perms --- docker-compose.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 docker-compose.yml diff --git a/docker-compose.yml b/docker-compose.yml old mode 100644 new mode 100755 From c44a0fbdd02433832fd20b998b69a14eb1da9b0b Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Thu, 27 Jan 2022 01:46:27 +0000 Subject: [PATCH 7/8] Update README.md Update MD for Multi-Arch Docker --- README.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1735783..3251d36 100755 --- a/README.md +++ b/README.md @@ -28,6 +28,7 @@ This document assumes the reader is familiar with Linux/UNIX, the Python program **Using docker version** +Docker file included for own image build To work with provided docker setup you will need: * A private repository with your configuration files (all .cfg files in repo will be copyed to the application root directory on start up) * A service user able to read your private repository (or be brave and publish your configuration, or be really brave and give your username and password to the docker) @@ -38,18 +39,19 @@ Build your own image from source ```bash -docker build . -t millaguie/hblink:3.0.0 +docker build . -t hblink3/hblink3:latest ``` -Or user a prebuilt one in docker hub: millaguie/hblink:3.0.0 +Or user a prebuilt one in docker hub: shaymez/hblink3:latest +This image is multi-arch Wake up your container ```bash touch /var/log/hblink.log -chown 65000 /var/log/hblink.log - run -v /var/log/hblink.log:/var/log/hblink.log -e GIT_USER=$USER -e GIT_PASSWORD=$PASSWORD -e GIT_REPO=$URL_TO_REPO_WITHOUT_HTTPS:// -p 54000:54000 millaguie/hblink:3.0.0 +chown 54000 -R /var/log/hblink.log + run -v /var/log/hblink/hblink.log:/var/log/hblink/hblink.log -e GIT_USER=$USER -e GIT_PASSWORD=$PASSWORD -e GIT_REPO=$URL_TO_REPO_WITHOUT_HTTPS:// -p 54000:54000 shaymez/hblink3:latest ``` **MORE DOCUMENTATION TO COME** From 9ea18c769e0db8b6a81cfb37382ea9bcbf0f4b60 Mon Sep 17 00:00:00 2001 From: M0VUB <76499782+ShaYmez@users.noreply.github.com> Date: Fri, 28 Jan 2022 22:10:37 +0000 Subject: [PATCH 8/8] Update docker-compose.yml Set YAML ver 2.4 --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index cb7e746..df58a61 100755 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.3' +version: '2.4' services: hblink3: container_name: hblink