0ct0pu5/runtipi
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

chore: merge master

Browse source
This commit is contained in:
Nicolas Meienberger 2022-10-09 23:02:32 +02:00
commit 606555a1cc
5 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -16,6 +16,8 @@ repos/*
apps/* apps/*
!apps/.gitkeep !apps/.gitkeep
traefik/shared traefik/shared
media
state/* state/*
!state/.gitkeep !state/.gitkeep
media media

3
docker-compose.dev.yml
View file

@ -125,9 +125,6 @@ services:
networks: networks:
tipi_main_network: tipi_main_network:
driver: bridge driver: bridge
driver_opts:
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.enable_icc: "true"
ipam: ipam:
driver: default driver: default
config: config:

3
docker-compose.rc.yml
View file

@ -129,9 +129,6 @@ services:
networks: networks:
tipi_main_network: tipi_main_network:
driver: bridge driver: bridge
driver_opts:
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.enable_icc: "true"
ipam: ipam:
driver: default driver: default
config: config:

3
docker-compose.yml
View file

@ -130,9 +130,6 @@ services:
networks: networks:
tipi_main_network: tipi_main_network:
driver: bridge driver: bridge
driver_opts:
com.docker.network.bridge.enable_ip_masquerade: "true"
com.docker.network.bridge.enable_icc: "true"
ipam: ipam:
driver: default driver: default
config: config:

22
scripts/start.sh
View file

@ -16,8 +16,6 @@ clean_logs
NGINX_PORT=80 NGINX_PORT=80
NGINX_PORT_SSL=443 NGINX_PORT_SSL=443
DOMAIN=tipi.localhost DOMAIN=tipi.localhost
NETWORK_INTERFACE="$(ip route | grep default | awk '{print $5}' | uniq)"
INTERNAL_IP="$(ip addr show "${NETWORK_INTERFACE}" | grep "inet " | awk '{print $2}' | cut -d/ -f1)"
STATE_FOLDER="${ROOT_FOLDER}/state" STATE_FOLDER="${ROOT_FOLDER}/state"
SED_ROOT_FOLDER="$(echo "$ROOT_FOLDER" | sed 's/\//\\\//g')" SED_ROOT_FOLDER="$(echo "$ROOT_FOLDER" | sed 's/\//\\\//g')"
DNS_IP=9.9.9.9 # Default to Quad9 DNS DNS_IP=9.9.9.9 # Default to Quad9 DNS
@ -31,6 +29,26 @@ POSTGRES_PASSWORD=$(derive_entropy "postgres")
TIPI_VERSION=$(get_json_field "${ROOT_FOLDER}/package.json" version) TIPI_VERSION=$(get_json_field "${ROOT_FOLDER}/package.json" version)
storage_path="${ROOT_FOLDER}" storage_path="${ROOT_FOLDER}"
STORAGE_PATH_ESCAPED="$(echo "${storage_path}" | sed 's/\//\\\//g')" STORAGE_PATH_ESCAPED="$(echo "${storage_path}" | sed 's/\//\\\//g')"
NETWORK_INTERFACE="$(ip route | grep default | awk '{print $5}' | uniq)"
NETWORK_INTERFACE_COUNT=$(echo "$NETWORK_INTERFACE" | wc -l)
if [[ "$NETWORK_INTERFACE_COUNT" -eq 0 ]]; then
echo "No network interface found!"
exit 1
elif [[ "$NETWORK_INTERFACE_COUNT" -gt 1 ]]; then
echo "Found multiple network interfaces. Please select one of the following interfaces:"
echo "$NETWORK_INTERFACE"
while true; do
read -rp "> " USER_NETWORK_INTERFACE
if echo "$NETWORK_INTERFACE" | grep -x "$USER_NETWORK_INTERFACE"; then
NETWORK_INTERFACE="$USER_NETWORK_INTERFACE"
break
else
echo "Please select one of the interfaces above. (CTRL+C to abort)"
fi
done
fi
INTERNAL_IP="$(ip addr show "${NETWORK_INTERFACE}" | grep "inet " | awk '{print $2}' | cut -d/ -f1)"
if [[ "$ARCHITECTURE" == "aarch64" ]]; then if [[ "$ARCHITECTURE" == "aarch64" ]]; then
ARCHITECTURE="arm64" ARCHITECTURE="arm64"