Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-07-01 12:32:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tanner, prepare merger w/ master

Browse source
This commit is contained in:
t3chn0m4g3 2020-03-09 09:44:26 +00:00
parent a18304dfdc
commit fb3777141b
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docker/tanner/phpox/Dockerfile
View file

@ -1,8 +1,5 @@
FROM alpine:3.10 FROM alpine:3.10
# #
# Include dist
ADD dist/ /root/dist/
#
# Install packages # Install packages
RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
apk -U --no-cache add \ apk -U --no-cache add \
@ -32,7 +29,6 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
# Install PHP Sandbox # Install PHP Sandbox
git clone --depth=1 https://github.com/mushorg/phpox /opt/phpox && \ git clone --depth=1 https://github.com/mushorg/phpox /opt/phpox && \
cd /opt/phpox && \ cd /opt/phpox && \
# cp /root/dist/sandbox.py . && \
pip3 install -r requirements.txt && \ pip3 install -r requirements.txt && \
make && \ make && \
# #

4
docker/tanner/tanner/Dockerfile
View file

@ -19,8 +19,8 @@ RUN sed -i 's/dl-cdn/dl-2/g' /etc/apk/repositories && \
# Setup Tanner # Setup Tanner
git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \ git clone --depth=1 https://github.com/mushorg/tanner /opt/tanner && \
cd /opt/tanner/ && \ cd /opt/tanner/ && \
git fetch origin pull/364/head:test && \ # git fetch origin pull/364/head:test && \
git checkout test && \ # git checkout test && \
cp /root/dist/config.py /opt/tanner/tanner/ && \ cp /root/dist/config.py /opt/tanner/tanner/ && \
pip3 install --no-cache-dir setuptools && \ pip3 install --no-cache-dir setuptools && \
pip3 install --no-cache-dir -r requirements.txt && \ pip3 install --no-cache-dir -r requirements.txt && \

2
update.sh
View file

@ -63,7 +63,7 @@ function fuSELFUPDATE () {
echo "###### $myBLUE""No updates found in repository.""$myWHITE" echo "###### $myBLUE""No updates found in repository.""$myWHITE"
return return
fi fi
myRESULT=$(git diff --name-only origin/dev | grep update.sh) myRESULT=$(git diff --name-only origin/master | grep update.sh)
if [ "$myRESULT" == "update.sh" ]; if [ "$myRESULT" == "update.sh" ];
then then
echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE" echo "###### $myBLUE""Found newer version, will be pulling updates and restart myself.""$myWHITE"

2
version
View file

@ -1 +1 @@
19.03.1 19.03.2