From 0a3899fe6aafbdd31744841975c54cbcc9c1ee70 Mon Sep 17 00:00:00 2001 From: Areli Fuss Date: Sun, 19 Nov 2017 13:28:08 +0200 Subject: Replace base to alpine Replace the docker base to slim linux based on Alpine and optimize the docker file Change-Id: I82035cfaa259b9323b64e206ad09c0431230fcdd Issue-Id: SDC-660 Signed-off-by: Areli Fuss --- base_sdc-backend/Dockerfile | 33 --------------------------------- base_sdc-elasticsearch/Dockerfile | 15 ++++++++------- base_sdc-jetty/Dockerfile | 34 ++++++++++++++++++++++++++++++++++ base_sdc-sanity/Dockerfile | 22 +++++++++------------- pom.xml | 28 +++++++--------------------- 5 files changed, 58 insertions(+), 74 deletions(-) delete mode 100644 base_sdc-backend/Dockerfile create mode 100644 base_sdc-jetty/Dockerfile diff --git a/base_sdc-backend/Dockerfile b/base_sdc-backend/Dockerfile deleted file mode 100644 index ca47370..0000000 --- a/base_sdc-backend/Dockerfile +++ /dev/null @@ -1,33 +0,0 @@ -FROM jetty:9.3-jre8 - -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 apt-get -y update && apt-get -y install \ - apt-utils \ - curl \ - vim \ - jq \ - python \ - libssl-dev \ - libcurl4-openssl-dev \ - python-dev \ - gcc \ - python-pip - -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash - -RUN pip install pycurl - -USER jetty - diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile index 09e8e78..e2f1e86 100644 --- a/base_sdc-elasticsearch/Dockerfile +++ b/base_sdc-elasticsearch/Dockerfile @@ -1,4 +1,4 @@ -FROM elasticsearch:2.1.2 +FROM elasticsearch:2.4.6-alpine ARG HTTP_PROXY ARG HTTPS_PROXY @@ -9,13 +9,14 @@ 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 \ - apt-utils \ +RUN apk add --no-cache \ curl \ - vim + vim \ + && : RUN mkdir -p /var/chef/nodes -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash - +# 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 diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile new file mode 100644 index 0000000..d4283be --- /dev/null +++ b/base_sdc-jetty/Dockerfile @@ -0,0 +1,34 @@ +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 + +USER jetty + diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index 29f8b20..dee2bde 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -1,4 +1,4 @@ -FROM ubuntu:16.04 +FROM openjdk:8-jdk-alpine ARG HTTP_PROXY ARG HTTPS_PROXY @@ -7,18 +7,14 @@ 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 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 --no-install-recommends \ - apt-utils \ +RUN apk add --no-cache \ curl \ - default-jre \ - openjdk-8-jdk \ - vim - -# Set Java links -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 + 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 diff --git a/pom.xml b/pom.xml index d5caf63..6302e5c 100644 --- a/pom.xml +++ b/pom.xml @@ -38,33 +38,20 @@ 0.15.1 - + - openecomp/base_sdc-backend - base_sdc-backend + openecomp/base_sdc-jetty + base_sdc-jetty true ${docker.tag} ${docker.latest.tag} - ${project.basedir}/base_sdc-backend + ${project.basedir}/base_sdc-jetty - - - openecomp/base_sdc-frontend - base_sdc-frontend - - true - - ${docker.tag} - ${docker.latest.tag} - - ${project.basedir}/base_sdc-frontend - - - + openecomp/base_sdc-kibana base_sdc-kibana @@ -127,7 +114,7 @@ true - openecomp/base_sdc-backend,openecomp/base_sdc-frontend,openecomp/base_sdc-elasticsearch,openecomp/base_sdc-kibana,openecomp/base_sdc-cassandra,openecomp/base_sdc-sanity + openecomp/base_sdc-jetty,openecomp/base_sdc-frontend,openecomp/base_sdc-elasticsearch,openecomp/base_sdc-kibana,openecomp/base_sdc-cassandra,openecomp/base_sdc-sanity @@ -143,11 +130,10 @@ push-images deploy - build push - openecomp/base_sdc-backend,openecomp/base_sdc-frontend,openecomp/base_sdc-elasticsearch,openecomp/base_sdc-kibana,openecomp/base_sdc-cassandra,openecomp/base_sdc-sanity + openecomp/base_sdc-jetty,openecomp/base_sdc-frontend,openecomp/base_sdc-elasticsearch,openecomp/base_sdc-kibana,openecomp/base_sdc-cassandra,openecomp/base_sdc-sanity -- cgit 1.2.3-korg