Merge pull request #729 from thriqon/allow-docker-ce-version-number

Allow docker ce version number as parameter to type
This commit is contained in:
Darko Poljak 2018-12-13 20:13:32 +01:00 committed by GitHub
commit a9427f6b2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 5 deletions

View file

@ -20,6 +20,9 @@ OPTIONAL PARAMETERS
-------------------
state
'present' or 'absent', defaults to 'present'
version
The specific version to install. Defaults to the special value 'latest',
meaning the version the package manager will install by default.
BOOLEAN PARAMETERS
@ -38,6 +41,8 @@ EXAMPLES
# Remove docker
__docker --state absent
# Install specific version
__docker --state present --version 18.03.0.ce
AUTHORS
-------

View file

@ -21,6 +21,7 @@
os=$(cat "$__global/explorer/os")
state=$(cat "$__object/parameter/state")
version=$(cat "$__object/parameter/version")
case "$os" in
centos)
@ -33,7 +34,11 @@ case "$os" in
--gpgcheck 1 \
--gpgkey 'https://download.docker.com/linux/centos/gpg' \
--state "${state}"
if [ "$version" != "latest" ]; then
require="__yum_repo/docker-ce-stable" __package docker-ce --version "${version}" --state "${state}"
else
require="__yum_repo/docker-ce-stable" __package docker-ce --state "${state}"
fi
else
echo "CentOS version 7 is required!" >&2
exit 1
@ -47,14 +52,17 @@ case "$os" in
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
__apt_source docker \
require="__apt_key_uri/docker" __apt_source docker \
--uri "https://download.docker.com/linux/${os}" \
--distribution "$(cat "$__global/explorer/lsb_codename")" \
--state "${state}" \
--component "stable"
__package docker-ce --state "${state}"
unset CDIST_ORDER_DEPENDENCY
if [ "$version" != "latest" ]; then
require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
else
require="__apt_source/docker" __package docker-ce --state "${state}"
fi
;;
*)
echo "Your operating system ($os) is currently not supported by this type (${__type##*/})." >&2

View file

@ -0,0 +1 @@
latest

View file

@ -1 +1,2 @@
state
version