NgTech-LTD/gns3-server
2
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2024-11-17 01:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Do not overwrites persistent Docker volumes. Fixes #2358.

Browse Source
This commit is contained in:
grossmj 2017-12-17 22:35:26 +01:00
parent 3e3e1df051
commit 630afc5469
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gns3server/compute/docker/docker_vm.py
View File

@ -236,6 +236,7 @@ class DockerVM(BaseNode):
""" """
path = os.path.join(self.working_dir, "etc", "network") path = os.path.join(self.working_dir, "etc", "network")
os.makedirs(path, exist_ok=True) os.makedirs(path, exist_ok=True)
open(os.path.join(path, ".gns3_perms"), 'a').close()
os.makedirs(os.path.join(path, "if-up.d"), exist_ok=True) os.makedirs(os.path.join(path, "if-up.d"), exist_ok=True)
os.makedirs(os.path.join(path, "if-down.d"), exist_ok=True) os.makedirs(os.path.join(path, "if-down.d"), exist_ok=True)
os.makedirs(os.path.join(path, "if-pre-up.d"), exist_ok=True) os.makedirs(os.path.join(path, "if-pre-up.d"), exist_ok=True)

18
gns3server/compute/docker/resources/init.sh
View File

@ -35,17 +35,17 @@ do
mkdir -p "$i" mkdir -p "$i"
# Copy original files if destination is empty (first start) # Copy original files if destination is empty (first start)
[ "$(ls -A "/gns3volumes$i")" ] || cp -a "$i/." "/gns3volumes$i" if [ ! -f "/gns3volumes$i/.gns3_perms" ]; then
cp -a "$i/." "/gns3volumes$i"
touch "/gns3volumes$i/.gns3_perms"
fi
mount --bind "/gns3volumes$i" "$i" mount --bind "/gns3volumes$i" "$i"
if [ -f "$i/.gns3_perms" ] while IFS=: read PERMS OWNER GROUP FILE
then do
while IFS=: read PERMS OWNER GROUP FILE [ -L "$FILE" ] || chmod "$PERMS" "$FILE"
do chown -h "${OWNER}:${GROUP}" "$FILE"
[ -L "$FILE" ] || chmod "$PERMS" "$FILE" done < "$i/.gns3_perms"
chown -h "${OWNER}:${GROUP}" "$FILE"
done < "$i/.gns3_perms"
fi
done done