sparrowhawk/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove usage of CDIST_ORDER_DEPENDENCY

Browse source
This commit is contained in:
Jonas Weber 2018-12-13 13:26:40 +01:00
parent a7f4c8d773
commit d4bb114468
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cdist/conf/type/__docker/manifest
View file

@ -52,18 +52,17 @@ case "$os" in
fi fi
__apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \ __apt_key_uri docker --name "Docker Release (CE deb) <docker@docker.com>" \
--uri "https://download.docker.com/linux/${os}/gpg" --state "${state}" --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}" \ --uri "https://download.docker.com/linux/${os}" \
--distribution "$(cat "$__global/explorer/lsb_codename")" \ --distribution "$(cat "$__global/explorer/lsb_codename")" \
--state "${state}" \ --state "${state}" \
--component "stable" --component "stable"
if [ "$version" != "latest" ]; then if [ "$version" != "latest" ]; then
__package docker-ce --version "${version}" --state "${state}" require="__apt_source/docker" __package docker-ce --version "${version}" --state "${state}"
else else
__package docker-ce --state "${state}" require="__apt_source/docker" __package docker-ce --state "${state}"
fi fi
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