aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAreli Fuss <af732p@att.com>2017-10-26 14:08:33 +0300
committerAreli Fuss <af732p@att.com>2017-10-26 14:22:46 +0300
commit1f53339198a9223541026e18057d7f0d827300f2 (patch)
treec8c394f89c9c5e32c10e784f6bb177f9dcd6294f
parentbd4cc984825086f8199bed1b79879b3c7e904304 (diff)
Add connection check
Add connection check before GPG key as debugging build failure on snap Change-Id: I71da085a6fe1e82fb210ec2582153a948557f8d8 Issue-Id: VVP-25 Signed-off-by: Areli Fuss <af732p@att.com>
-rwxr-xr-xDockerfile5
-rwxr-xr-xassets/setup17
2 files changed, 18 insertions, 4 deletions
diff --git a/Dockerfile b/Dockerfile
index 807a8cd..2c13134 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-# ============LICENSE_START=======================================================
+# ============LICENSE_START=======================================================
# org.onap.vvp/gitlab
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -47,7 +47,8 @@ RUN apt-get update -q \
apt-transport-https \
vim \
nano \
- patch
+ patch \
+ curl
# Copy assets
COPY RELEASE /
diff --git a/assets/setup b/assets/setup
index 8c431bc..ed42fc1 100755
--- a/assets/setup
+++ b/assets/setup
@@ -1,5 +1,5 @@
#!/bin/bash
-# ============LICENSE_START=======================================================
+# ============LICENSE_START=======================================================
# org.onap.vvp/gitlab
# ===================================================================
# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
@@ -43,7 +43,20 @@ 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
-wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
+#wget -q -O - https://packages.gitlab.com/gpg.key | apt-key add -
+
+echo "####################################################"
+echo "[DBG] Test connection to https://packages.gitlab.com"
+sleep 3
+curl -s --head https://packages.gitlab.com | head -n 1
+sleep 3
+echo "####################################################"
+
+echo "####################################################"
+echo "[DBG] Test Get key"
+curl -L https://packages.gitlab.com/gitlab/gitlab-ce/gpgkey | apt-key add -
+echo "####################################################"
+
apt-get update
apt-get install -yq --no-install-recommends ${RELEASE_PACKAGE}=${RELEASE_VERSION}