From 376175a2bf3444dd34cbe79eebdddb997ca5687c Mon Sep 17 00:00:00 2001
From: Areli Fuss <af732p@att.com>
Date: Wed, 8 Nov 2017 10:46:25 +0200
Subject: Revert all changes to the baseline

Revert all changes to the baseline
after Docker MTU changes

Change-Id: I092c23e45e4bd6a77ef366e1f598ccdd9b7f0e12
Issue-Id: VVP-25
Signed-off-by: Areli Fuss <af732p@att.com>
---
 Dockerfile   | 33 +--------------------------------
 assets/setup |  6 +++---
 pom.xml      |  1 -
 3 files changed, 4 insertions(+), 36 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 0dfbb00..9633a54 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -47,42 +47,11 @@ RUN apt-get update -q \
       apt-transport-https \
       vim \
       nano \
-      patch \
-      curl
+      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
-
-#TEST
-RUN echo "####### TEST START #########"
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
-
-ENV HTTP_PROXY  ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-
-RUN if [ ! -z ${HTTP_PROXY} ]; then echo "Acquire::http::proxy  \"${HTTP_PROXY}\";" >> /etc/apt/apt.conf; fi && \
-    if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-ADD https://packages.gitlab.com/login ttt
-RUN curl https://packages.gitlab.com/login
-
-RUN echo "####### TEST END #########"
-
-
-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
-
 RUN /assets/setup
 
 # Allow to access embedded tools
diff --git a/assets/setup b/assets/setup
index 255ef45..27af8cb 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
-#wget -d --secure-protocol=TLSv1 --no-check-certificate -O - https://packages.gitlab.com/gpg.key | apt-key add -
-#apt-get update
+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 -
+apt-get update
 apt-get install -yq --no-install-recommends ${RELEASE_PACKAGE}=${RELEASE_VERSION}
 
 # Create sshd daemon
diff --git a/pom.xml b/pom.xml
index 5314838..c7c8cec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -108,7 +108,6 @@
                     <id>push-images</id>
                     <phase>deploy</phase>
                     <goals>
-                        <goal>build</goal>
                         <goal>push</goal>
                     </goals>
                     <configuration>
-- 
cgit 1.2.3-korg