Update __docker type
- Update installation method, following official installation instructions. - docker-engine was renamed to Docker CE around March 2017. Update manpage to reflect that change. - Remove flag `--experimental` since it is no longer necessary to install a different binary to get experimental features. Experimental features are included in the stable binary and can be enabled by a flag or in a config file.
This commit is contained in:
Adam Dej
parent
c2f8c7abb3
commit
2e653409c1
3 changed files with 28 additions and 55 deletions
|
|
@ -3,12 +3,12 @@ cdist-type__docker(7)
|
||||||
|
|
||||||
NAME
|
NAME
|
||||||
----
|
----
|
||||||
cdist-type__docker - install docker-engine
|
cdist-type__docker - install Docker CE
|
||||||
|
|
||||||
|
|
||||||
DESCRIPTION
|
DESCRIPTION
|
||||||
-----------
|
-----------
|
||||||
Installs latest docker-engine package from dockerproject.org.
|
Installs latest Docker Community Edition package.
|
||||||
|
|
||||||
|
|
||||||
REQUIRED PARAMETERS
|
REQUIRED PARAMETERS
|
||||||
|
|
@ -18,16 +18,13 @@ None.
|
||||||
|
|
||||||
OPTIONAL PARAMETERS
|
OPTIONAL PARAMETERS
|
||||||
-------------------
|
-------------------
|
||||||
None.
|
state
|
||||||
|
'present' or 'absent', defaults to 'present'
|
||||||
|
|
||||||
|
|
||||||
BOOLEAN PARAMETERS
|
BOOLEAN PARAMETERS
|
||||||
------------------
|
------------------
|
||||||
experimental
|
None.
|
||||||
Install the experimental docker-engine package instead of the latest stable release.
|
|
||||||
|
|
||||||
state
|
|
||||||
'present' or 'absent', defaults to 'present'
|
|
||||||
|
|
||||||
|
|
||||||
EXAMPLES
|
EXAMPLES
|
||||||
|
|
@ -38,9 +35,6 @@ EXAMPLES
|
||||||
# Install docker
|
# Install docker
|
||||||
__docker
|
__docker
|
||||||
|
|
||||||
# Install experimental
|
|
||||||
__docker --experimental
|
|
||||||
|
|
||||||
# Remove docker
|
# Remove docker
|
||||||
__docker --state absent
|
__docker --state absent
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,57 +24,37 @@ state=$(cat "$__object/parameter/state")
|
||||||
|
|
||||||
case "$os" in
|
case "$os" in
|
||||||
centos)
|
centos)
|
||||||
component="main"
|
if (source "$__global/explorer/os_release" && [ "${VERSION_ID}" = "7" ]); then
|
||||||
if [ -f "$__object/parameter/experimental" ]; then
|
__yum_repo docker-ce-stable \
|
||||||
component="experimental"
|
--name 'Docker CE Stable' \
|
||||||
fi
|
--baseurl "https://download.docker.com/linux/centos/7/\$basearch/stable" \
|
||||||
__yum_repo docker \
|
|
||||||
--name 'Docker Repository' \
|
|
||||||
--baseurl "https://yum.dockerproject.org/repo/$component/centos/\$releasever/" \
|
|
||||||
--enabled \
|
--enabled \
|
||||||
--gpgcheck 1 \
|
--gpgcheck 1 \
|
||||||
--gpgkey 'https://yum.dockerproject.org/gpg' \
|
--gpgkey 'https://download.docker.com/linux/centos/gpg' \
|
||||||
--state ${state}
|
--state ${state}
|
||||||
require="__yum_repo/docker" __package docker-engine --state ${state}
|
require="__yum_repo/docker-ce-stable" __package docker-ce --state ${state}
|
||||||
;;
|
else
|
||||||
ubuntu)
|
echo "CentOS version 7 is required!" >&2
|
||||||
component="main"
|
exit 1
|
||||||
if [ -f "$__object/parameter/experimental" ]; then
|
|
||||||
component="experimental"
|
|
||||||
fi
|
fi
|
||||||
__package apparmor --state ${state}
|
;;
|
||||||
__package ca-certificates --state ${state}
|
ubuntu|debian)
|
||||||
__package apt-transport-https --state ${state}
|
if [ "${state}" = "present" ]; then
|
||||||
__apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
|
__package apt-transport-https
|
||||||
|
__package ca-certificates
|
||||||
|
__package gnupg2
|
||||||
|
fi
|
||||||
|
__apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
|
||||||
|
--uri "https://download.docker.com/linux/${os}/gpg" --state ${state}
|
||||||
export CDIST_ORDER_DEPENDENCY=on
|
export CDIST_ORDER_DEPENDENCY=on
|
||||||
__apt_source docker \
|
__apt_source docker \
|
||||||
--uri https://apt.dockerproject.org/repo \
|
--uri "https://download.docker.com/linux/${os}" \
|
||||||
--distribution "ubuntu-$(cat "$__global/explorer/lsb_codename")" \
|
--distribution "$(cat "$__global/explorer/lsb_codename")" \
|
||||||
--state ${state} \
|
--state ${state} \
|
||||||
--component "$component"
|
--component "stable"
|
||||||
__package docker-engine --state ${state}
|
__package docker-ce --state ${state}
|
||||||
unset CDIST_ORDER_DEPENDENCY
|
unset CDIST_ORDER_DEPENDENCY
|
||||||
;;
|
;;
|
||||||
debian)
|
|
||||||
component="main"
|
|
||||||
if [ -f "$__object/parameter/experimental" ]; then
|
|
||||||
component="experimental"
|
|
||||||
fi
|
|
||||||
|
|
||||||
__package apt-transport-https --state ${state}
|
|
||||||
__package ca-certificates --state ${state}
|
|
||||||
__package gnupg2 --state ${state}
|
|
||||||
__apt_key docker --keyid 58118E89F3A912897C070ADBF76221572C52609D --state ${state}
|
|
||||||
export CDIST_ORDER_DEPENDENCY=on
|
|
||||||
__apt_source docker \
|
|
||||||
--uri https://apt.dockerproject.org/repo \
|
|
||||||
--distribution "debian-$(cat "$__global/explorer/lsb_codename")" \
|
|
||||||
--state ${state} \
|
|
||||||
--component "$component"
|
|
||||||
__package docker-engine --state ${state}
|
|
||||||
unset CDIST_ORDER_DEPENDENCY
|
|
||||||
|
|
||||||
;;
|
|
||||||
*)
|
*)
|
||||||
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2
|
||||||
echo "Please contribute an implementation for it if you can." >&2
|
echo "Please contribute an implementation for it if you can." >&2
|
||||||
|
|
|
||||||
|
|
@ -1 +0,0 @@
|
||||||
experimental
|
|
||||||
Loading…
Reference in a new issue