fix merge failure

set all versions in the bases

Change-Id: I9e54a5b391c97c261045d8e6fca02aa84f926478
Issue-ID: SDC-1222
Signed-off-by: Michael Lando <ml636r@att.com>

diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile
index eb440f7..5251106 100644 (file)
--- a/base_sdc-cassandra/Dockerfile
+++ b/base_sdc-cassandra/Dockerfile
@@ -1,24 +1,14 @@
 FROM cassandra:2.1.17
 
-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 
-
-#ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get -y update && apt-get -y install --no-install-recommends \
-    curl   \
-    vim \
-    apt-utils  \
-    openjdk-8-jdk \
-    python
+RUN apt-get -y update && \
+    apt-get -y install --no-install-recommends \
+    curl=7.38.0-4+deb8u10 \
+    vim=2:7.4.488-7+deb8u3 \
+    apt-utils=1.0.9.8.4 \
+    openjdk-8-jdk=8u162-b12-1~bpo8+1 \
+    python=2.7.9-1
 
 RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java
 
-# install chef-solo
 RUN curl -L https://omnitruck.chef.io/install.sh | bash
 

diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile
index 41daef7..59e84eb 100644 (file)
--- a/base_sdc-cqlsh/Dockerfile
+++ b/base_sdc-cqlsh/Dockerfile
@@ -1,20 +1,7 @@
 FROM openjdk:8-jdk-alpine
 
-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
-RUN if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-RUN  apk add --no-cache \
-     py-pip
-
-RUN pip install cqlsh==4.0.1
-
-# Install Chef
-RUN set -ex && \
-    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
-    gem install chef berkshelf io-console --no-document
+RUN apk add --no-cache py-pip && \
+    pip install cqlsh==4.0.1 && \
+    set -ex && \
+    apk add --no-cache bash=4.4.19-r1 build-base=0.5-r0 ruby=2.4.4-r0 ruby-dev=2.4.4-r0 libffi-dev=3.2.1-r4 libxml2-dev=2.9.7-r0 && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document

diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile
index 744e62d..8cbfeb2 100644 (file)
--- a/base_sdc-elasticsearch/Dockerfile
+++ b/base_sdc-elasticsearch/Dockerfile
@@ -1,22 +1,8 @@
 FROM elasticsearch:2.4.6-alpine
 
-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
-
-RUN apk add --no-cache \
-    curl \
-    vim \
-    && :
-
 RUN mkdir -p /var/chef/nodes
 
 # Install Chef
 RUN set -ex && \
-    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
-    gem install chef:13.8.5 berkshelf io-console --no-document
+    apk add --no-cache curl vim bash=4.4.12-r2 build-base=0.5-r0 ruby=2.4.4-r0 ruby-dev=2.4.4-r0 libffi-dev=3.2.1-r4 libxml2-dev=2.9.7-r0 && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document

diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile
index 41ee86f..84d9ee1 100644 (file)
--- a/base_sdc-jetty/Dockerfile
+++ b/base_sdc-jetty/Dockerfile
@@ -1,34 +1,27 @@
 FROM jetty:9.3-jre8-alpine
 
-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
-
 USER root
 
-RUN apk add --no-cache \
-    jq \
-    curl \
-    curl-dev \
-    openssl-dev \
-    python \
-    python-dev \
-    py-pip \
-    py-setuptools \
-    vim \
-    && :
 
 # Install Chef
 RUN set -ex && \
-    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
-    gem install chef berkshelf io-console --no-document
-
-RUN pip install pycurl
+    apk add --no-cache \
+        jq=1.5-r5 \
+        curl=7.59.0-r0 \
+        curl-dev=7.59.0-r0 \
+        openssl-dev=1.0.2o-r0 \
+        vim=8.0.1359-r0 \
+        bash=4.4.19-r1 \
+        build-base=0.5-r0 \
+        ruby=2.4.4-r0 \
+        ruby-dev=2.4.4-r0 \
+        libffi-dev=3.2.1-r4 \
+        libxml2-dev=2.9.7-r0 && \
+    gem install \
+        chef:13.8.5 \
+        berkshelf:6.3.1 \
+        io-console:0.4.6 \
+        --no-document
 
 # Replace Jetty user ID
 COPY set_jetty_user.sh /tmp/set_jetty_user.sh

diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile
index 10ece1a..76d2d11 100644 (file)
--- a/base_sdc-kibana/Dockerfile
+++ b/base_sdc-kibana/Dockerfile
@@ -1,17 +1,8 @@
 FROM kibana:4.3.3
 
-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 
-
 RUN apt-get -y update && apt-get -y install \
-    curl \
-    vim
+    curl=7.38.0-4+deb8u10 \
+    vim=2:7.4.488-7+deb8u3
 
 # install chef-solo
 RUN curl -L https://omnitruck.chef.io/install.sh | bash

diff --git a/base_sdc-python/Dockerfile b/base_sdc-python/Dockerfile
index bfd8276..f572933 100644 (file)
--- a/base_sdc-python/Dockerfile
+++ b/base_sdc-python/Dockerfile
@@ -1,30 +1,14 @@
 FROM python:2.7-alpine
 
-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
-RUN if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-# Install packages
-RUN apk add --no-cache \
-    libcurl  \
-    curl  \
-    jq
-
 # Install packages only needed for building
-RUN apk add --no-cache --virtual .build-dependencies build-base curl-dev
+RUN  apk add --no-cache libcurl=7.59.0-r0 curl=7.59.0-r0 jq=1.5-r2 && \
+     apk add --no-cache --virtual .build-dependencies build-base=0.4-r1 curl-dev=7.59.0-r0
 
 # Needed for pycurl
 ENV PYCURL_SSL_LIBRARY=openssl
 
-# Pip stuff
-RUN pip install influxdb pycurl requests
-
 # Install Chef
-RUN set -ex && \
-    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
-    gem install chef:13.8.5 berkshelf io-console --no-document
+RUN pip install 'influxdb==5.0.0' 'pycurl== 7.43.0.1' 'requests==2.18.4' &&  \
+    set -ex && \
+    apk add --no-cache bash=4.3.42-r5 ruby=2.3.7-r0 ruby-dev=2.3.7-r0 libffi-dev=3.2.1-r2 libxml2-dev=2.9.5-r0 && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document

diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile
index dee2bde..ce53b20 100644 (file)
--- a/base_sdc-sanity/Dockerfile
+++ b/base_sdc-sanity/Dockerfile
@@ -1,20 +1,6 @@
 FROM openjdk:8-jdk-alpine
 
-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
-RUN if [ ! -z ${HTTPS_PROXY} ]; then echo "Acquire::https::proxy \"${HTTPS_PROXY}\";" >> /etc/apt/apt.conf; fi
-
-RUN apk add --no-cache \
-    curl \
-    vim \
-    && :
-
 # Install Chef
 RUN set -ex && \
-    apk add --no-cache bash build-base ruby ruby-dev libffi-dev libxml2-dev && \
-    gem install chef berkshelf io-console --no-document
+    apk add --no-cache curl vim bash=4.4.19-r1 build-base=0.5-r0 ruby=2.4.4-r0 ruby-dev=2.4.4-r0 libffi-dev=3.2.1-r4 libxml2-dev=2.9.7-r0 && \
+    gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 --no-document

diff --git a/base_sdc-vnc/Dockerfile b/base_sdc-vnc/Dockerfile
index b01357b..d24f319 100644 (file)
--- a/base_sdc-vnc/Dockerfile
+++ b/base_sdc-vnc/Dockerfile
@@ -1,17 +1,8 @@
 FROM consol/ubuntu-xfce-vnc:1.3.0
 
-ARG HTTP_PROXY
-ARG HTTPS_PROXY
-
-ENV HTTP_PROXY  ${HTTP_PROXY}
-ENV HTTPS_PROXY ${HTTPS_PROXY}
-
 USER 0
 
-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
-
-RUN apt-get -y update && apt-get -y install curl
+RUN apt-get -y update && apt-get -y install curl=7.47.0-1ubuntu2.7
 
 # install chef-solo
 RUN curl -L  https://www.opscode.com/chef/install.sh | bash

diff --git a/pom.xml b/pom.xml
index 116ddd9..a9af7d1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
   <groupId>org.onap.sdc.sdc-docker-base</groupId>
   <artifactId>sdc-docker-base</artifactId>
   <packaging>pom</packaging>
-  <version>1.3.0-SNAPSHOT</version>
+  <version>1.3.1-SNAPSHOT</version>
   <name>sdc-sdc-docker-base</name>
 
   <properties>
@@ -39,96 +39,96 @@
             <configuration>
                 <images>
                     <!-- base_sdc-jetty  for backend and frontend  -->
-                    <image>
-                        <name>onap/base_sdc-jetty</name>
-                        <alias>base_sdc-jetty</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir>
-                        </build>
-                    </image>
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-jetty</name>-->
+                        <!--<alias>base_sdc-jetty</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-jetty</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
                            <!-- base_sdc-kibana  -->
-                    <image>
-                        <name>onap/base_sdc-kibana</name>
-                        <alias>base_sdc-kibana</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir>
-                        </build>
-                    </image>
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-kibana</name>-->
+                        <!--<alias>base_sdc-kibana</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-kibana</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
                            <!-- base_sdc-cassandra  -->
-                    <image>
-                        <name>onap/base_sdc-cassandra</name>
-                        <alias>base_sdc-cassandra</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir>
-                        </build>
-                    </image>
-                    <!-- base_sdc-cqlsh -->
-                    <image>
-                        <name>onap/base_sdc-cqlsh</name>
-                        <alias>base_sdc-cqlsh</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir>
-                        </build>
-                    </image>
-                                       <!-- base_sdc-python  -->
-                    <image>
-                        <name>onap/base_sdc-python</name>
-                        <alias>base_sdc-python</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir>
-                        </build>
-                    </image>
-                    <!-- base_sdc-elasticsearch  -->
-                    <image>
-                        <name>onap/base_sdc-elasticsearch</name>
-                        <alias>base_sdc-elasticsearch</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir>
-                        </build>
-                    </image>
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-cassandra</name>-->
+                        <!--<alias>base_sdc-cassandra</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-cassandra</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
+                    <!--&lt;!&ndash; base_sdc-cqlsh &ndash;&gt;-->
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-cqlsh</name>-->
+                        <!--<alias>base_sdc-cqlsh</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-cqlsh</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
+                                        <!--base_sdc-python-->
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-python</name>-->
+                        <!--<alias>base_sdc-python</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-python</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
+                     <!--base_sdc-elasticsearch-->
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-elasticsearch</name>-->
+                        <!--<alias>base_sdc-elasticsearch</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-elasticsearch</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
                     <!-- base_sdc-sanity  -->
-                    <image>
-                        <name>onap/base_sdc-sanity</name>
-                        <alias>base_sdc-sanity</alias>
-                        <build>
-                            <cleanup>true</cleanup>
-                            <tags>
-                                <tag>${docker.tag}</tag>
-                                <tag>${docker.latest.tag}</tag>
-                            </tags>
-                            <dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir>
-                        </build>
-                    </image>
+                    <!--<image>-->
+                        <!--<name>onap/base_sdc-sanity</name>-->
+                        <!--<alias>base_sdc-sanity</alias>-->
+                        <!--<build>-->
+                            <!--<cleanup>true</cleanup>-->
+                            <!--<tags>-->
+                                <!--<tag>${docker.tag}</tag>-->
+                                <!--<tag>${docker.latest.tag}</tag>-->
+                            <!--</tags>-->
+                            <!--<dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir>-->
+                        <!--</build>-->
+                    <!--</image>-->
                                         <!-- base_sdc-vnc  -->
                     <image>
                         <name>onap/base_sdc-vnc</name>