From ad5ee5ac5bbf73937990e071d990396763d18fbc Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel.sambuc@epfl.ch>
Date: Mon, 12 Mar 2018 10:52:00 +0100
Subject: [PATCH] Install script improvements

 1. Hold packages at specific versions to prevent unexpected upgrades.

 2. Add recommendation to add the current user to the `docker` group to
    allow sudo-less usage of the docker commands.
---
 install-redhat.sh | 12 +++++++++++-
 install-ubuntu.sh | 11 ++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/install-redhat.sh b/install-redhat.sh
index 63f21a7..c60fd53 100755
--- a/install-redhat.sh
+++ b/install-redhat.sh
@@ -40,10 +40,20 @@ Docker Repository correct key is:
 If prompted, check the key is correct and accept it.
 EOT
 
-sudo yum install docker-ce
+sudo yum install docker-ce-17.12.0.ce-1
+sudo yum install yum-versionlock
+sudo yum versionlock docker-ce
 
 sudo systemctl start docker
 
 # Install docker-compose
 sudo curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
+
+cat <<EOT
+Add you user to the docker group to be able to use the docker command without
+administrator rights or sudo.
+
+  sudo usermod -a -G docker $USER
+
+EOT
diff --git a/install-ubuntu.sh b/install-ubuntu.sh
index e5bc925..8decb66 100755
--- a/install-ubuntu.sh
+++ b/install-ubuntu.sh
@@ -36,8 +36,17 @@ sudo add-apt-repository \
    $(lsb_release -cs) \
    stable"
 sudo apt update
-sudo apt install docker-ce
+sudo apt install docker-ce=17.12.1~ce-0~ubuntu
+sudo apt-mark hold docker-ce
 
 # Install docker-compose
 sudo curl -L https://github.com/docker/compose/releases/download/1.18.0/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose
 sudo chmod +x /usr/local/bin/docker-compose
+
+cat <<EOT
+Add you user to the docker group to be able to use the docker command without
+administrator rights or sudo.
+
+  sudo usermod -a -G docker $USER
+
+EOT