Browse Source

Merge branch '15-setuptools' into 'master'

Resolve "ModuleNotFoundError: setuptools"

Closes #15

See merge request cyber5k/mistborn!12
merge-requests/13/merge
Steven Foerster 6 years ago
parent
commit
3226d3fd7c
  1. 2
      compose/production/traefik/traefik.toml.template
  2. 1
      scripts/install.sh
  3. 2
      scripts/subinstallers/docker.sh

2
compose/production/traefik/traefik.toml.template

@ -74,7 +74,7 @@ defaultEntryPoints = ["http"] @@ -74,7 +74,7 @@ defaultEntryPoints = ["http"]
[backends.cockpit]
[backends.cockpit.servers.server1]
url = "http://IPV4_PUBLIC:9090"
url = "http://10.2.3.1:9090"
[frontends]
[frontends.django]

1
scripts/install.sh

@ -181,7 +181,6 @@ sudo mkdir -p ../mistborn_volumes/extra @@ -181,7 +181,6 @@ sudo mkdir -p ../mistborn_volumes/extra
# Traefik final setup (cockpit)
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
sudo docker-compose -f base.yml pull || true

2
scripts/subinstallers/docker.sh

@ -61,7 +61,7 @@ echo "Installing Docker Compose" @@ -61,7 +61,7 @@ echo "Installing Docker Compose"
#elif [ "$DISTRO" == "raspbian" ]; then
# Install required packages
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
# This might take a while

Loading…
Cancel
Save