Merge branch '2.0' into 2.1

This commit is contained in:
Julien Duponchelle committed 2017-05-31 16:58:31 +02:00
commit 93adef91d8
19 files changed
+218 -21

No files matched your search

+5 -1
View File
@@ -152,7 +152,7 @@ log "Update system packages"
apt-get update
log "Upgrade packages"
apt-get upgrade -y
apt-get upgrade --yes --force-yes -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold"
log " Install GNS3 packages"
apt-get install -y gns3-server
@@ -163,6 +163,10 @@ then
useradd -d /opt/gns3/ -m gns3
fi
log "Add GNS3 to the ubridge group"
usermod -aG ubridge gns3
log "Install docker"
if [ ! -f "/usr/bin/docker" ]
then