From b2a7c82cf1a93651e354f9dc21967d6dcd163c0c Mon Sep 17 00:00:00 2001 From: Yuli Shlosberg Date: Tue, 13 Mar 2018 11:24:51 +0200 Subject: new base docker Change-Id: I5ae8f1f5a6c6d3d7e35063f4120b14a7227f05e0 Issue-ID: SDC-384 Signed-off-by: Yuli Shlosberg --- base_sdc-vnc/Dockerfile | 17 +++++++++++++++++ pom.xml | 17 +++++++++++++++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 base_sdc-vnc/Dockerfile diff --git a/base_sdc-vnc/Dockerfile b/base_sdc-vnc/Dockerfile new file mode 100644 index 0000000..4ee593d --- /dev/null +++ b/base_sdc-vnc/Dockerfile @@ -0,0 +1,17 @@ +FROM consol/ubuntu-xfce-vnc + +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 + +# install chef-solo +RUN curl -L https://www.opscode.com/chef/install.sh | bash diff --git a/pom.xml b/pom.xml index 1b51fcc..9428f38 100644 --- a/pom.xml +++ b/pom.xml @@ -128,6 +128,19 @@ ${project.basedir}/base_sdc-sanity + + + + onap/base_sdc-vnc + base_sdc-vnc + + true + + ${docker.tag} + ${docker.latest.tag} + + ${project.basedir}/base_sdc-vnc + @@ -140,7 +153,7 @@ true - onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python + onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python,onap/base_sdc-vnc @@ -159,7 +172,7 @@ push - onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python + onap/base_sdc-jetty,onap/base_sdc-elasticsearch,onap/base_sdc-kibana,onap/base_sdc-cassandra,onap/base_sdc-sanity,onap/base_sdc-cqlsh,onap/base_sdc-python,onap/base_sdc-vnc -- cgit 1.2.3-korg