From adf0cd16f4db1bc834950aefddb7ef79d6d50222 Mon Sep 17 00:00:00 2001 From: Areli Fuss Date: Thu, 2 Nov 2017 10:57:18 +0200 Subject: Add additional wget options Add no check certificate option to wget Change-Id: If966fca8d3af8a548e9e2ca20fc3b180483a6a9d Issue-Id: VVP-25 Signed-off-by: Areli Fuss --- Dockerfile | 4 +--- assets/setup | 22 +--------------------- 2 files changed, 2 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8126a5a..9633a54 100755 --- a/Dockerfile +++ b/Dockerfile @@ -47,9 +47,7 @@ RUN apt-get update -q \ apt-transport-https \ vim \ nano \ - patch \ - curl \ - telnet + patch # Copy assets COPY RELEASE / diff --git a/assets/setup b/assets/setup index 01e1221..9111443 100755 --- a/assets/setup +++ b/assets/setup @@ -43,27 +43,7 @@ source /RELEASE # Download & Install GitLab echo "deb https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_${RELEASE_PACKAGE}.list - - -echo "####################################################" -echo "[DBG] Test connection to https://packages.gitlab.com" -echo "####################################################" - - -echo "################ IFCONFIG #######################" -sudo ifconfig - -echo "################ TELNET #######################" - -telnet packages.gitlab.com 443 - -echo "################ CURL #######################" - -curl -v https://packages.gitlab.com/gpg.key - -echo "####################################################" - -wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add - +wget --no-check-certificate -q -O - https://packages.gitlab.com/gpg.key | apt-key add - apt-get update apt-get install -yq --no-install-recommends ${RELEASE_PACKAGE}=${RELEASE_VERSION} -- cgit 1.2.3-korg