Feature 10296 Pip Standardization

As this module does not use python, there is very little to
change here.  Simply a cleanup of the Dockerfile.

Change-Id: I784d83325897765e8cd5c3c3f303eaccaedcdcc2
Signed-off-by: beierlm <mark.beierl@canonical.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644 (file)
index 0000000..eb9750e
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,17 @@
+# Copyright Contributors to ETSI OSM
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+include:
+  - project: 'devops/cicd'
+    file: '/templates/osm-base.yml'

diff --git a/Dockerfile b/Dockerfile
index 4fbfef7..f222244 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -10,16 +10,21 @@
 # implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
-# This Dockerfile is intented for devops and deb package generation
+########################################################################################
+# This Dockerfile is intented for devops testing and deb package generation
+#
+# To run stage 2 locally:
+#
+#   docker build -t stage2 .
+#   docker run -ti -v `pwd`:/work -w /work --entrypoint /bin/bash stage2
+#   devops-stages/stage-test.sh
+#   devops-stages/stage-build.sh
 #
-# Use Dockerfile.local for running osm/NBI in a docker container from source
-# Use Dockerfile.fromdeb for running osm/NBI in a docker container from last stable package
-
 
 FROM ubuntu:18.04
 
-RUN apt-get update && apt-get -y install git make libcurl4-gnutls-dev \
-    libgnutls28-dev debhelper apt-utils dh-make
-       
-       
\ No newline at end of file
+RUN DEBIAN_FRONTEND=noninteractive apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get -y install \
+        debhelper \
+        dh-make \
+        git