Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-10-28 02:52:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dynamically pin asyncssh and python versions

Browse source 
- version-pinning asyncssh dependency as defined in the upstream heralding requirements file (current sed command is accidentally concatenating the hard-coded string "1.18.0" with the version defined in the upstream heralding requirements file, resulting in a string like "asyncssh==1.18.0>=2.0.0". This will cause the Docker build to fail.
- dynamically setting python installation directory, making this Dockerfile compatible with any version of python (current path is hard-coded and the build might fail if a newer version of python - e.g. 3.8.1-r1 is installed)
This commit is contained in:
pisces-period 2020-02-24 17:28:08 +01:00 committed by GitHub
parent b7b6e9fa0e
commit 2824d1a09d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docker/heralding/Dockerfile
View file

@ -23,16 +23,17 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
cd /opt/ && \ cd /opt/ && \
git clone --depth=1 https://github.com/johnnykv/heralding && \ git clone --depth=1 https://github.com/johnnykv/heralding && \
cd heralding && \ cd heralding && \
sed -i 's/asyncssh/asyncssh==1.18.0/' requirements.txt && \ sed -i 's/asyncssh\W*/asyncssh==/' requirements.txt && \
pip3 install --no-cache-dir -r requirements.txt && \ pip3 install --no-cache-dir -r requirements.txt && \
pip3 install --no-cache-dir . && \ pip3 install --no-cache-dir . && \
# #
# Setup user, groups and configs # Setup user, groups and configs
export PYTHON_DIR=$(python3 --version | tr '[A-Z]' '[a-z]' | tr -d ' ' | cut -d '.' -f 1,2 ) && \
addgroup -g 2000 heralding && \ addgroup -g 2000 heralding && \
adduser -S -H -s /bin/ash -u 2000 -D -g 2000 heralding && \ adduser -S -H -s /bin/ash -u 2000 -D -g 2000 heralding && \
mkdir -p /var/log/heralding/ /etc/heralding && \ mkdir -p /var/log/heralding/ /etc/heralding && \
mv /root/dist/heralding.yml /etc/heralding/ && \ mv /root/dist/heralding.yml /etc/heralding/ && \
setcap cap_net_bind_service=+ep /usr/bin/python3.7 && \ setcap cap_net_bind_service=+ep /usr/bin/$PYTHON_DIR && \
chown -R heralding:heralding /var/log/heralding && \ chown -R heralding:heralding /var/log/heralding && \
# #
# Clean up # Clean up
@ -47,7 +48,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
py-virtualenv && \ py-virtualenv && \
rm -rf /root/* \ rm -rf /root/* \
/var/cache/apk/* \ /var/cache/apk/* \
/opt/heralding /opt/heralding && \
unset PYTHON_DIR
# #
# Start Heralding # Start Heralding
STOPSIGNAL SIGINT STOPSIGNAL SIGINT