From de0fd824b52e33f9090bf852083a7bec2d698317 Mon Sep 17 00:00:00 2001
From: Areli Fuss <af732p@att.com>
Date: Sun, 5 Nov 2017 19:04:38 +0200
Subject: [PATCH] Move apt-get update to Dockerfile

Move apt-get update to Dockerfile

Change-Id: Ic2eb22593462cdf261a8b547068da4ab7759dcb0
Issue-Id: VVP-25
Signed-off-by: Areli Fuss <af732p@att.com>
---
 Dockerfile   | 13 ++++++++++---
 assets/setup |  4 ++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f920626..6964e09 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -49,14 +49,21 @@ RUN apt-get update -q \
       nano \
       patch
 
+# Copy assets
+COPY RELEASE /
+COPY assets/ /assets/
+
 #Workaround for onap
+ENV RELEASE_VERSION 8.6.1-ce.0
+ENV PACKAGECLOUD_REPO gitlab-ce
+ENV RELEASE_PACKAGE gitlab-ce
+
 ADD https://packages.gitlab.com/gpg.key key
 RUN cat key | apt-key add -
 RUN apt-key list
+RUN echo "deb https://packages.gitlab.com/gitlab/${PACKAGECLOUD_REPO}/ubuntu/ `lsb_release -cs` main" > /etc/apt/sources.list.d/gitlab_${RELEASE_PACKAGE}.list
+RUN apt-get update
 
-# Copy assets
-COPY RELEASE /
-COPY assets/ /assets/
 RUN /assets/setup
 
 # Allow to access embedded tools
diff --git a/assets/setup b/assets/setup
index ccad286..255ef45 100755
--- a/assets/setup
+++ b/assets/setup
@@ -42,9 +42,9 @@ set -xe
 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 "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 -
-apt-get update
+#apt-get update
 apt-get install -yq --no-install-recommends ${RELEASE_PACKAGE}=${RELEASE_VERSION}
 
 # Create sshd daemon
-- 
2.16.6