crappyrules/mistborn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch '15-setuptools' into 'master'

Browse Source 
Resolve "ModuleNotFoundError: setuptools"

Closes #15

See merge request cyber5k/mistborn!12
This commit is contained in:
Steven Foerster
2020-03-27 17:08:27 +00:00
parent 7755c627b3 12fc535fc3
commit 3226d3fd7c
3 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compose/production/traefik/traefik.toml.template
+1 -1
View File
@@ -74,7 +74,7 @@ defaultEntryPoints = ["http"]
[backends.cockpit] [backends.cockpit]
[backends.cockpit.servers.server1] [backends.cockpit.servers.server1]
url = "http://IPV4_PUBLIC:9090" url = "http://10.2.3.1:9090"
[frontends] [frontends]
[frontends.django] [frontends.django]
scripts/install.sh
-1
View File
@@ -181,7 +181,6 @@ sudo mkdir -p ../mistborn_volumes/extra
# Traefik final setup (cockpit) # Traefik final setup (cockpit)
cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml cp ./compose/production/traefik/traefik.toml.template ./compose/production/traefik/traefik.toml
sudo sed -i "s/IPV4_PUBLIC/$IPV4_PUBLIC/" ./compose/production/traefik/traefik.toml
# Download docker images while DNS is operable # Download docker images while DNS is operable
sudo docker-compose -f base.yml pull || true sudo docker-compose -f base.yml pull || true
scripts/subinstallers/docker.sh
+1 -1
View File
@@ -61,7 +61,7 @@ echo "Installing Docker Compose"
#elif [ "$DISTRO" == "raspbian" ]; then #elif [ "$DISTRO" == "raspbian" ]; then
# Install required packages # Install required packages
sudo apt update sudo apt update
sudo apt install -y python python3-pip libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev sudo apt install -y python python3-pip python3-setuptools libffi-dev python-backports.ssl-match-hostname python3-dev libssl-dev
# Install Docker Compose from pip # Install Docker Compose from pip
# This might take a while # This might take a while