aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAreli Fuss <af732p@att.com>2017-11-05 12:47:35 +0200
committerAreli Fuss <af732p@att.com>2017-11-05 12:47:35 +0200
commite8df04c680d128453827dc443fd21b1083dbb2a5 (patch)
tree8550439ff5fd20def3e94422f81cadbffecb0930
parent78dd28d593a4ba8815cb81dc940f52b6f77133dc (diff)
Move the add key to Dockerfile
Workaround for onap Change-Id: Iea0ba52fce4c1536a1bf304a631eb0e2cc2a0368 Issue-Id: VVP-25 Signed-off-by: Areli Fuss <af732p@att.com>
-rwxr-xr-xDockerfile5
-rwxr-xr-xassets/setup2
2 files changed, 6 insertions, 1 deletions
diff --git a/Dockerfile b/Dockerfile
index 9633a54..f920626 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,6 +49,11 @@ RUN apt-get update -q \
nano \
patch
+#Workaround for onap
+ADD https://packages.gitlab.com/gpg.key key
+RUN cat key | apt-key add -
+RUN apt-key list
+
# Copy assets
COPY RELEASE /
COPY assets/ /assets/
diff --git a/assets/setup b/assets/setup
index ff57d4a..ccad286 100755
--- a/assets/setup
+++ b/assets/setup
@@ -43,7 +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
-wget -d --secure-protocol=TLSv1 --no-check-certificate -O - https://packages.gitlab.com/gpg.key | apt-key add -
+#wget -d --secure-protocol=TLSv1 --no-check-certificate -O - https://packages.gitlab.com/gpg.key | apt-key add -
apt-get update
apt-get install -yq --no-install-recommends ${RELEASE_PACKAGE}=${RELEASE_VERSION}