Skip to content
This repository has been archived by the owner on Nov 8, 2022. It is now read-only.

Commit

Permalink
Fixed docker installation script (#747)
Browse files Browse the repository at this point in the history
  • Loading branch information
iwankgb authored Jul 6, 2017
1 parent 97342fa commit dc5fadb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ Vagrant.configure(2) do |config|
# non-cached ami: ami-6d1c2007
### USE BASE/CACHED IMAGE
#aws.ami = "ami-6d1c2007" # base image
aws.ami = (ENV['SWAN_AMI'] != '' && ENV['SWAN_AMI'] || "ami-45032753") # Thu, 25 May 2017 20:29:44 +0200
aws.ami = (ENV['SWAN_AMI'] != '' && ENV['SWAN_AMI'] || "ami-39999c2f") # Thu, 25 May 2017 20:29:44 +0200
if build_cached_image
override.vm.provision "shell", path: "provision.sh", env: {
'VAGRANT_USER' => vagrant_user,
Expand Down
5 changes: 4 additions & 1 deletion vagrant/provision_experiment_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ K8S_VERSION="v1.6.4"
SNAP_VERSION="1.2.0"
ETCD_VERSION="3.1.0"
DOCKER_VERSION="17.03.0.ce-1.el7.centos"
# The offical Docker repository is not very, stable apparently.
# See https://github.com/moby/moby/issues/33930#issuecomment-312782998 for explanation.
DOCKER_INSTALL_OPTS="-y -q --setopt=obsoletes=0"
SNAP_PLUGIN_COLLECTOR_DOCKER_VERSION=5
SNAP_PLUGIN_COLLECTOR_RDT_VERSION=1
SNAP_PLUGIN_COLLECTOR_USE_VERSION=1
Expand Down Expand Up @@ -83,7 +86,7 @@ echo "----------------------------- Install Docker (`date`)"
# https://docs.docker.com/engine/installation/linux/centos/#install-using-the-repository
yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo
yum makecache fast -y -q
yum install -y -q docker-ce-${DOCKER_VERSION}
yum install ${DOCKER_INSTALL_OPTS} docker-ce-${DOCKER_VERSION}
echo "Restart docker"
systemctl enable docker
systemctl start docker
Expand Down

0 comments on commit dc5fadb

Please sign in to comment.