diff options
| author |   Yuli Shlosberg <ys9693@att.com> | 2018-03-13 11:24:51 +0200 |
|---|---|---|
| committer | Yuli Shlosberg <ys9693@att.com> | 2018-03-13 11:32:39 +0200 |
| commit | b2a7c82cf1a93651e354f9dc21967d6dcd163c0c (patch) | |
| tree | 00b870f13262391da903bc79299ce6a15838fb67 | |
| parent | cb3fe736c296ddca3825220011fa7528b64ee271 (diff) | |
new base docker
Change-Id: I5ae8f1f5a6c6d3d7e35063f4120b14a7227f05e0
Issue-ID: SDC-384
Signed-off-by: Yuli Shlosberg <ys9693@att.com>
| -rw-r--r-- | base_sdc-vnc/Dockerfile | 17 | ||||
| -rw-r--r-- | pom.xml | 17 |
2 files changed, 32 insertions, 2 deletions
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 @@ -129,6 +129,19 @@ <dockerFileDir>${project.basedir}/base_sdc-sanity</dockerFileDir> </build> </image> + <!-- base_sdc-vnc --> + <image> + <name>onap/base_sdc-vnc</name> + <alias>base_sdc-vnc</alias> + <build> + <cleanup>true</cleanup> + <tags> + <tag>${docker.tag}</tag> + <tag>${docker.latest.tag}</tag> + </tags> + <dockerFileDir>${project.basedir}/base_sdc-vnc</dockerFileDir> + </build> + </image> </images> </configuration> <executions> @@ -140,7 +153,7 @@ </goals> <configuration> <removeAll>true</removeAll> - <image>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</image> + <image>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</image> </configuration> </execution> @@ -159,7 +172,7 @@ <goal>push</goal> </goals> <configuration> - <image>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</image> + <image>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</image> </configuration> </execution> </executions> |