diff --git a/install/centos/install-docker b/install/centos/install-docker index c5b0bca..fe18c2f 100755 --- a/install/centos/install-docker +++ b/install/centos/install-docker @@ -8,7 +8,8 @@ enabled=1 gpgcheck=1 gpgkey=https://yum.dockerproject.org/gpg EOT -yum install -y docker-engine-1.9.1-1.el7.centos +yum install -y yum-versionlock docker-engine-1.9.1-1.el7.centos +yum versionlock docker-engine systemctl start docker systemctl enable docker diff --git a/install/ubuntu/install-docker b/install/ubuntu/install-docker index 999069f..52dbcc3 100755 --- a/install/ubuntu/install-docker +++ b/install/ubuntu/install-docker @@ -8,6 +8,7 @@ deb https://apt.dockerproject.org/repo ubuntu-trusty main EOT apt-get -y update apt-get -y install linux-image-extra-$(uname -r) docker-engine=1.9.1-0~trusty +apt-mark hold docker-engine cat > /etc/init.d/dockerrestart << EOT #!/bin/bash cgroups-umount diff --git a/packaging/debian/master/DEBIAN/control b/packaging/debian/master/DEBIAN/control index 5901f04..492eb52 100644 --- a/packaging/debian/master/DEBIAN/control +++ b/packaging/debian/master/DEBIAN/control @@ -3,7 +3,7 @@ Version: 1.0-2 Section: unknown Priority: extra Architecture: all -Depends: opennebula (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils +Depends: opennebula (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine (=1.9.1-0~trusty) Maintainer: Indigo DC Project (https://github.com/indigo-dc/onedock) Description: ONEDock ONEDock is a set of extensions for OpenNebula to use containers as diff --git a/packaging/debian/node/DEBIAN/control b/packaging/debian/node/DEBIAN/control index 007f08e..1b7f37a 100644 --- a/packaging/debian/node/DEBIAN/control +++ b/packaging/debian/node/DEBIAN/control @@ -3,7 +3,7 @@ Version: 1.0-2 Section: unknown Priority: extra Architecture: all -Depends: opennebula-node (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils +Depends: opennebula-node (>= 4.12.3+dfsg-3build1), xmlstarlet (>= 1.5.0-1), mount, jq (>= 1.3-1.1ubuntu1), qemu-utils, docker-engine (=1.9.1-0~trusty) Maintainer: Indigo DC Project (https://github.com/indigo-dc/onedock) Description: ONEDock (for internal nodes) ONEDock is a set of extensions for OpenNebula to use containers as diff --git a/packaging/rpm/onedock-master.spec b/packaging/rpm/onedock-master.spec index df8629f..69e16f4 100644 --- a/packaging/rpm/onedock-master.spec +++ b/packaging/rpm/onedock-master.spec @@ -6,7 +6,7 @@ URL: https://github.com/indigo-dc/onedock License: Apache-2.0 Group: unknown BuildRoot: %{_tmppath}/%{name}-root -Requires: xmlstarlet jq opennebula +Requires: xmlstarlet jq opennebula docker-engine = 1.9.1-1.el7.centos Source0: onedock-master-%{version}.tar.gz BuildArch: noarch diff --git a/packaging/rpm/onedock-node.spec b/packaging/rpm/onedock-node.spec index 001310b..a9c145b 100644 --- a/packaging/rpm/onedock-node.spec +++ b/packaging/rpm/onedock-node.spec @@ -6,7 +6,7 @@ URL: https://github.com/indigo-dc/onedock License: Apache-2.0 Group: unknown BuildRoot: %{_tmppath}/%{name}-root -Requires: xmlstarlet jq opennebula-node-kvm +Requires: xmlstarlet jq opennebula-node-kvm docker-engine = 1.9.1-1.el7.centos BuildArch: noarch %description