diff options
| -rwxr-xr-x | Dockerfile | 5 | ||||
| -rwxr-xr-x | assets/setup | 17 |
2 files changed, 18 insertions, 4 deletions
@@ -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} |