Merge pull request #356 from devimc/topic/fixSnap

snap: use sudo to configure and start docker
This commit is contained in:
Jose Carlos Venegas Munoz 2019-02-22 11:02:01 -06:00 committed by GitHub
commit a8e458aae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -131,12 +131,19 @@ parts:
export PATH="${GOROOT}/bin:${PATH}"
if [ -n "$http_proxy" ]; then
echo "Setting proxy $http_proxy"
systemctl set-environment http_proxy=$http_proxy || true
systemctl set-environment https_proxy=$https_proxy || true
sudo -E systemctl set-environment http_proxy=$http_proxy || true
sudo -E systemctl set-environment https_proxy=$https_proxy || true
fi
echo "Unmasking docker service"
sudo -E systemctl unmask docker.service || true
sudo -E systemctl unmask docker.socket || true
echo "Adding $USER into docker group"
sudo -E gpasswd -a $USER docker
echo "Starting docker"
systemctl start docker || true
sudo -E systemctl start docker || true
# use the same go version for all packages
sed -i 's|^GO_VERSION=.*|GO_VERSION='$(go version | cut -d' ' -f3 | tr -d go)'|g' rootfs-builder/versions.txt