ShaYmez/RYSEN
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2 from jamesturner246/docker-fix

Browse Source 
Fix and tidy the Docker files.

Thanks James :-)
This commit is contained in:
hacknix 2021-01-17 21:14:41 +00:00 committed by GitHub
commit ccf6e73215
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
Dockerfile
View File

@ -1,30 +1,25 @@
FROM python:3.7-slim-stretch FROM python:3.7-slim-buster
RUN apt update && \ COPY entrypoint /entrypoint
RUN useradd -u 54000 radio && \
apt update && \
apt install -y git && \ apt install -y git && \
cd /usr/src/ && \ cd /usr/src/ && \
git clone https://github.com/n0mjs710/dmr_utils3 && \ git clone https://github.com/hacknix/dmr_utils && \
cd /usr/src/dmr_utils3 && \ cd /usr/src/dmr_utils && \
./install.sh && \ ./install.sh && \
rm -rf /var/lib/apt/lists/* && \ rm -rf /var/lib/apt/lists/* && \
cd /opt && \ cd /opt && \
rm -rf /usr/src/dmr_utils3 && \ rm -rf /usr/src/dmr_utils && \
git clone https://github.com/hacknix/hblink3 git clone https://github.com/hacknix/freedmr && \
ENV AAA BBBB cd /opt/freedmr/ && \
RUN cd /opt/hblink3/ && \
sed -i s/.*python.*//g requirements.txt && \ sed -i s/.*python.*//g requirements.txt && \
pip install --no-cache-dir -r requirements.txt pip install --no-cache-dir -r requirements.txt && \
chown radio /opt/freedmr
ADD entrypoint /entrypoint
RUN adduser -u 54000 radio && \
adduser radio radio && \
chmod 755 /entrypoint && \
chown radio:radio /entrypoint && \
chown radio /opt/hblink3
USER radio USER radio
EXPOSE 54000 EXPOSE 54000
ENTRYPOINT [ "/entrypoint" ] ENTRYPOINT [ "/entrypoint" ]

24
README.md
View File

@ -36,31 +36,21 @@ None. The owners of this work make absolutely no warranty, express or implied. U
**PRE-REQUISITE KNOWLEDGE:** **PRE-REQUISITE KNOWLEDGE:**
This document assumes the reader is familiar with Linux/UNIX, the Python programming language and DMR. This document assumes the reader is familiar with Linux/UNIX, the Python programming language and DMR.
**Using docker version**
To work with provided docker setup you will need: **Using the docker version**
* 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)
* A server with docker installed
* Follow this simple steps:
Build your own image from source Build the docker image
```bash ```bash
docker build --tag freedmr .
docker build . -t millaguie/hblink:3.0.0
``` ```
Or user a prebuilt one in docker hub: millaguie/hblink:3.0.0 Start your container
Wake up your container
```bash ```bash
touch /var/log/hblink.log cfg_file="/absolute/path/to/cfg/file"
chown 65000 /var/log/hblink.log run -v $cfg_file:/opt/freedmr/hblink.cfg -p 54000:54000 freedmr
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 ```
```
**MORE DOCUMENTATION TO COME** **MORE DOCUMENTATION TO COME**

19
entrypoint
View File

@ -1,19 +1,4 @@
#!/bin/sh #!/bin/sh
if [ -z "$GIT_REPO" ]; then cd /opt/freedmr
mkdir -p /var/tmp/config python /opt/freedmr/hblink.py -c hblink.cfg
cd /var/tmp/config
git clone https://${GIT_USER}:${GIT_PASSWORD}@${GIT_REPO}
DIR=$(echo ${GIT_REPO}| sed s/.git$//g | sed s#^.*/##g)
cp -a /var/tmp/config/${DIR}/*cfg /opt/hblink3/
cp -a /var/tmp/config/${DIR}/*csv /opt/hblink3/
cp -a /var/tmp/config/${DIR}/*json /opt/hblink3/
else
cp -a /opt/config/*cfg /opt/hblink3/
cp -a /opt/config/*csv /opt/hblink3/
cp -a /opt/config/*json /opt/hblink3/
fi
cd /opt/hblink3
python /opt/hblink3/hblink.py -c hblink.cfg