mirror of
https://github.com/docker/docker-install.git
synced 2026-11-20 10:03:11 +03:00
Revert "Merge pull request #95 from seemethere/ads"
This reverts commit40b1b76399, reversing changes made to26dda3d669. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
This commit is contained in:
1 parent
cfba4628ba
commit
dc0219174d
2 files changed
+1
-35
No files matched your search
Vendored
+1
@@ -21,6 +21,7 @@ def aarch64verifyTargets = [
|
||||
'aarch64-verify-install-ubuntu-xenial',
|
||||
'aarch64-verify-install-ubuntu-bionic',
|
||||
'aarch64-verify-install-centos-7',
|
||||
'aarch64-verify-install-fedora-29',
|
||||
]
|
||||
|
||||
def ppc64leverifyTargets = [
|
||||
|
||||
-35
@@ -202,39 +202,6 @@ ee_notice() {
|
||||
echo
|
||||
}
|
||||
|
||||
ee_promo() {
|
||||
# Randomly select an advertisement
|
||||
echo
|
||||
echo "** DOCKER ENGINE - ENTERPRISE **"
|
||||
echo
|
||||
SHORT_URL=""
|
||||
case $(shuf -i 0-1 -n 1) in
|
||||
0)
|
||||
echo "Test drive additional security features by activating Docker Engine - Enterprise."
|
||||
echo
|
||||
echo " * Leverage FIPS 140-2 validated encryption"
|
||||
echo " * Run only trusted images with digital signature enforcement"
|
||||
SHORT_URL="https://dockr.ly/engine1"
|
||||
;;
|
||||
1)
|
||||
echo "If you’re ready for production workloads, Docker Engine - Enterprise also includes:"
|
||||
echo
|
||||
echo " * SLA-backed technical support"
|
||||
echo " * Extended lifecycle maintenance policy for patches and hotfixes"
|
||||
echo " * Access to certified ecosystem content"
|
||||
SHORT_URL="https://dockr.ly/engine2"
|
||||
;;
|
||||
esac
|
||||
echo
|
||||
echo "** Learn more at ${SHORT_URL} **"
|
||||
echo
|
||||
echo "ACTIVATE your own engine to Docker Engine - Enterprise using:"
|
||||
echo
|
||||
echo " sudo docker engine activate"
|
||||
echo
|
||||
sleep 10
|
||||
}
|
||||
|
||||
do_install() {
|
||||
echo "# Executing docker install script, commit: $SCRIPT_COMMIT_SHA"
|
||||
|
||||
@@ -410,7 +377,6 @@ do_install() {
|
||||
$sh_c "apt-get install -y -qq --no-install-recommends docker-ce$pkg_version >/dev/null"
|
||||
)
|
||||
echo_docker_as_nonroot
|
||||
ee_promo
|
||||
exit 0
|
||||
;;
|
||||
centos|fedora)
|
||||
@@ -474,7 +440,6 @@ do_install() {
|
||||
$sh_c "$pkg_manager install -y -q docker-ce$pkg_version"
|
||||
)
|
||||
echo_docker_as_nonroot
|
||||
ee_promo
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
Reference in new issue
Block a user