Alex-Devera/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-04-28 19:28:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

switch to docker.io

Browse source 
improve proxy support
This commit is contained in:
Marco Ochse 2016-12-03 21:47:53 +01:00
parent fb71d49a56
commit fca1b3fd37
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
installer/data/systemd/netdata.service
View file

@ -7,6 +7,7 @@ After=docker.service
Restart=always Restart=always
ExecStartPre=-/usr/bin/docker stop netdata ExecStartPre=-/usr/bin/docker stop netdata
ExecStartPre=-/usr/bin/docker rm -v netdata ExecStartPre=-/usr/bin/docker rm -v netdata
ExecStartPre=-/bin/chmod 666 /var/run/docker.sock
ExecStart=/usr/bin/docker run --name netdata --net=host --cap-add=SYS_PTRACE --rm=true -v /proc:/host/proc:ro -v /sys:/host/sys:ro -v /var/run/docker.sock:/var/run/docker.sock dtagdevsec/netdata:latest1610 ExecStart=/usr/bin/docker run --name netdata --net=host --cap-add=SYS_PTRACE --rm=true -v /proc:/host/proc:ro -v /sys:/host/sys:ro -v /var/run/docker.sock:/var/run/docker.sock dtagdevsec/netdata:latest1610
ExecStop=/usr/bin/docker stop netdata ExecStop=/usr/bin/docker stop netdata

20
installer/install.sh
View file

@ -3,7 +3,7 @@
# T-Pot post install script # # T-Pot post install script #
# Ubuntu server 16.04.0, x64 # # Ubuntu server 16.04.0, x64 #
# # # #
# v16.10.0 by mo, DTAG, 2016-10-28 # # v16.10.0 by mo, DTAG, 2016-12-03 #
######################################################## ########################################################
# Some global vars # Some global vars
@ -274,23 +274,6 @@ fuECHO "### Installing wetty."
ln -s /usr/bin/nodejs /usr/bin/node ln -s /usr/bin/nodejs /usr/bin/node
npm install https://github.com/t3chn0m4g3/wetty -g npm install https://github.com/t3chn0m4g3/wetty -g
# Let's add the docker repository
fuECHO "### Adding the docker repository."
apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
tee /etc/apt/sources.list.d/docker.list <<EOF
deb https://apt.dockerproject.org/repo ubuntu-xenial main
EOF
# Let's pull some updates
fuECHO "### Pulling Updates."
apt-get update -y
# Let's install docker
fuECHO "### Installing docker-engine."
fuECHO "### You can safely ignore the [FAILED] message,"
fuECHO "### which is caused by a bug in the docker installer."
apt-get install docker-engine=1.12.2-0~xenial -y || true && sleep 5
# Let's add proxy settings to docker defaults # Let's add proxy settings to docker defaults
if [ -f $myPROXYFILEPATH ]; if [ -f $myPROXYFILEPATH ];
then fuECHO "### Setting up the proxy for docker." then fuECHO "### Setting up the proxy for docker."
@ -367,7 +350,6 @@ for name in $(cat /root/tpot/data/images.conf)
do do
docker pull dtagdevsec/$name:latest1610 docker pull dtagdevsec/$name:latest1610
done done
#fi
# Let's add the daily update check with a weekly clean interval # Let's add the daily update check with a weekly clean interval
fuECHO "### Modifying update checks." fuECHO "### Modifying update checks."