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

tweaking / improving:

Browse source 
- add glutton to builder
- reduce parallel builds to 2
- require root for tc
- add docker logins
This commit is contained in:
t3chn0m4g3 2024-12-06 09:55:31 +01:00
parent 59cc5c7d38
commit d416d2e56b
2 changed files with 22 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
docker/_builder/builder.sh
View file

@ -1,5 +1,13 @@
#!/usr/bin/env bash #!/usr/bin/env bash
# Got root?
myWHOAMI=$(whoami)
if [ "$myWHOAMI" != "root" ]
then
echo "Need to run as root ..."
exit
fi
# ANSI color codes for green (OK) and red (FAIL) # ANSI color codes for green (OK) and red (FAIL)
GREEN='\033[0;32m' GREEN='\033[0;32m'
RED='\033[0;31m' RED='\033[0;31m'
@ -8,7 +16,7 @@ NC='\033[0m' # No Color
# Default settings # Default settings
PUSH_IMAGES=false PUSH_IMAGES=false
NO_CACHE=false NO_CACHE=false
PARALLELBUILDS=8 PARALLELBUILDS=2
UPLOAD_BANDWIDTH=40mbit # Set this to max 90% of available upload bandwidth UPLOAD_BANDWIDTH=40mbit # Set this to max 90% of available upload bandwidth
INTERFACE=$(/sbin/ip address show | /usr/bin/awk '/inet.*brd/{ print $NF; exit }') INTERFACE=$(/sbin/ip address show | /usr/bin/awk '/inet.*brd/{ print $NF; exit }')
@ -26,6 +34,8 @@ while getopts ":pnh" opt; do
case ${opt} in case ${opt} in
p ) p )
PUSH_IMAGES=true PUSH_IMAGES=true
docker login
docker login ghcr.io
;; ;;
n ) n )
NO_CACHE=true NO_CACHE=true
@ -43,7 +53,7 @@ done
# Function to apply upload bandwidth limit using tc # Function to apply upload bandwidth limit using tc
apply_bandwidth_limit() { apply_bandwidth_limit() {
echo -n "Applying upload bandwidth limit of $UPLOAD_BANDWIDTH on interface $INTERFACE..." echo -n "Applying upload bandwidth limit of $UPLOAD_BANDWIDTH on interface $INTERFACE..."
if sudo tc qdisc add dev $INTERFACE root tbf rate $UPLOAD_BANDWIDTH burst 32kbit latency 400ms >/dev/null 2>&1; then if tc qdisc add dev $INTERFACE root tbf rate $UPLOAD_BANDWIDTH burst 32kbit latency 400ms >/dev/null 2>&1; then
echo -e " [${GREEN}OK${NC}]" echo -e " [${GREEN}OK${NC}]"
else else
echo -e " [${RED}FAIL${NC}]" echo -e " [${RED}FAIL${NC}]"
@ -51,7 +61,7 @@ apply_bandwidth_limit() {
# Try to reapply the limit # Try to reapply the limit
echo -n "Reapplying upload bandwidth limit of $UPLOAD_BANDWIDTH on interface $INTERFACE..." echo -n "Reapplying upload bandwidth limit of $UPLOAD_BANDWIDTH on interface $INTERFACE..."
if sudo tc qdisc add dev $INTERFACE root tbf rate $UPLOAD_BANDWIDTH burst 32kbit latency 400ms >/dev/null 2>&1; then if tc qdisc add dev $INTERFACE root tbf rate $UPLOAD_BANDWIDTH burst 32kbit latency 400ms >/dev/null 2>&1; then
echo -e " [${GREEN}OK${NC}]" echo -e " [${GREEN}OK${NC}]"
else else
echo -e " [${RED}FAIL${NC}]" echo -e " [${RED}FAIL${NC}]"
@ -64,14 +74,14 @@ apply_bandwidth_limit() {
# Function to check if the bandwidth limit is set # Function to check if the bandwidth limit is set
is_bandwidth_limit_set() { is_bandwidth_limit_set() {
sudo tc qdisc show dev $INTERFACE | grep -q 'tbf' tc qdisc show dev $INTERFACE | grep -q 'tbf'
} }
# Function to remove the bandwidth limit using tc if it is set # Function to remove the bandwidth limit using tc if it is set
remove_bandwidth_limit() { remove_bandwidth_limit() {
if is_bandwidth_limit_set; then if is_bandwidth_limit_set; then
echo -n "Removing upload bandwidth limit on interface $INTERFACE..." echo -n "Removing upload bandwidth limit on interface $INTERFACE..."
if sudo tc qdisc del dev $INTERFACE root; then if tc qdisc del dev $INTERFACE root; then
echo -e " [${GREEN}OK${NC}]" echo -e " [${GREEN}OK${NC}]"
else else
echo -e " [${RED}FAIL${NC}]" echo -e " [${RED}FAIL${NC}]"

14
docker/_builder/docker-compose.yml
View file

@ -127,13 +127,13 @@ services:
<<: *common-build <<: *common-build
# Glutton # Glutton
# glutton: glutton:
# image: ${TPOT_DOCKER_REPO}/glutton:${TPOT_VERSION} image: ${TPOT_DOCKER_REPO}/glutton:${TPOT_VERSION}
## build: build:
# tags: tags:
# - ${TPOT_GHCR_REPO}/glutton:${TPOT_VERSION} - ${TPOT_GHCR_REPO}/glutton:${TPOT_VERSION}
# context: ../glutton/ context: ../glutton/
# <<: *common-build <<: *common-build
# Go-pot # Go-pot
go-pot: go-pot: