From dc0219174dc96c191142f4824832c16a1f71b24a Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 15 Mar 2019 17:25:29 +0000 Subject: [PATCH 1/2] Revert "Merge pull request #95 from seemethere/ads" This reverts commit 40b1b763998f478b3774d93763ad33eacc77def8, reversing changes made to 26dda3d66987a707ec01f6fc2485bd0d379f7fee. Signed-off-by: Eli Uriegas --- Jenkinsfile | 1 + install.sh | 35 ----------------------------------- 2 files changed, 1 insertion(+), 35 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index aeadcb18..ce03e0b0 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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 = [ diff --git a/install.sh b/install.sh index 1499f0f9..4f338362 100644 --- a/install.sh +++ b/install.sh @@ -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 From 68f4a40de7ef7050616eebceed2a39e219658986 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Thu, 14 Feb 2019 22:23:26 +0000 Subject: [PATCH 2/2] Remove fedora 29 on arm64, it's not there Signed-off-by: Eli Uriegas (cherry picked from commit eabd8aa5ff67157ff989bd5c1a22fdb605c0c2c8) Signed-off-by: Eli Uriegas --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ce03e0b0..aeadcb18 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -21,7 +21,6 @@ def aarch64verifyTargets = [ 'aarch64-verify-install-ubuntu-xenial', 'aarch64-verify-install-ubuntu-bionic', 'aarch64-verify-install-centos-7', - 'aarch64-verify-install-fedora-29', ] def ppc64leverifyTargets = [