diff options
| -rw-r--r-- | base_sdc-cassandra/Dockerfile | 71 | ||||
| -rw-r--r-- | base_sdc-cqlsh/Dockerfile | 15 | ||||
| -rw-r--r-- | base_sdc-elasticsearch/Dockerfile | 14 | ||||
| -rw-r--r-- | base_sdc-jetty/Dockerfile | 32 | ||||
| -rw-r--r-- | base_sdc-kibana/Dockerfile | 46 | ||||
| -rw-r--r-- | base_sdc-python/Dockerfile | 41 | ||||
| -rw-r--r-- | base_sdc-sanity/Dockerfile | 14 | ||||
| -rw-r--r-- | base_sdc-vnc/Dockerfile | 8 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
10 files changed, 146 insertions, 99 deletions
diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile index 1ec1169..8db29b3 100644 --- a/base_sdc-cassandra/Dockerfile +++ b/base_sdc-cassandra/Dockerfile @@ -54,36 +54,45 @@ RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.lis echo "deb http://security.debian.org buster/updates main" >> /etc/apt/sources.list && \ apt-get -y update && \ apt-get -y --no-install-recommends install \ - vim=2:7.4.488-7+deb8u3 vim-common=2:7.4.488-7+deb8u3 vim-runtime=2:7.4.488-7+deb8u3 \ - apt-utils=1.0.9.8.4 \ + vim \ + vim-runtime \ + apt-utils \ openjdk-8-jdk \ - libavahi-client3=0.7-4 libavahi-common-data=0.7-4 libavahi-common3=0.7-4 \ - curl=7.60.0-2 libcurl4=7.60.0-2 \ - krb5-locales=1.16-2 libgssapi-krb5-2=1.16-2 libkrb5-3=1.16-2 libkrb5support0=1.16-2 \ - libtiff5=4.0.9-5 \ - libx11-6=2:1.6.5-1 libx11-data=2:1.6.5-1 libx11-xcb1=2:1.6.5-1 \ - libxml2=2.9.4+dfsg1-7 \ - libxtst6=2:1.2.3-1 \ - perl=5.26.2-6 \ - python=2.7.15-3 \ - libsqlite3-0=3.24.0-1 \ - libdb5.3=5.3.28-13.1+b1 \ - libcairo2=1.15.10-3 libcairo-gobject2=1.15.10-3 \ - libc-bin=2.27-3 libc6=2.27-3 multiarch-support=2.27-3 \ - libgtk2.0-0=2.24.32-1 libgtk2.0-common=2.24.32-1 \ - libharfbuzz0b=1.7.6-1+b1 \ - libgcrypt20=1.8.2-2 \ - libtasn1-6=4.13-3 \ - libxi6=2:1.7.9-1 \ - libldap-2.4-2=2.4.44+dfsg-5+deb9u1 \ - libpcre3=2:8.39-9 \ - passwd=1:4.5-1 \ - zlib1g=1:1.2.11.dfsg-1 \ - ntp=1:4.2.8p11+dfsg-1 && \ - apt-get -y autoremove - - -RUN update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java - -RUN curl -L https://omnitruck.chef.io/install.sh | bash + libavahi-client3 \ + libavahi-common3 \ + curl \ + libcurl4 \ + krb5-locales \ + libgssapi-krb5-2 \ + libkrb5-3 \ + libkrb5support0 \ + libtiff5 \ + libx11-6 \ + libx11-data \ + libx11-xcb1 \ + libxml2 \ + libxtst6 \ + perl \ + python \ + libsqlite3-0 \ + libdb5.3 \ + libcairo2 \ + libcairo-gobject2 \ + libc-bin \ + libc6 \ + multiarch-support \ + libgtk2.0-0 \ + libgtk2.0-common \ + libharfbuzz0b \ + libgcrypt20 \ + libtasn1-6 \ + libxi6 \ + libldap-2.4-2 \ + libpcre3 \ + passwd \ + zlib1g \ + ntp && \ + apt-get -y autoremove && \ + update-alternatives --set java /usr/lib/jvm/java-8-openjdk-amd64/jre/bin/java && \ + curl -L https://omnitruck.chef.io/install.sh | bash diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile index 3876ba9..5451a66 100644 --- a/base_sdc-cqlsh/Dockerfile +++ b/base_sdc-cqlsh/Dockerfile @@ -3,8 +3,17 @@ FROM openjdk:8-jdk-alpine 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 && \ + pip install cqlsh && \ + + apk add --no-cache \ + bash \ + build-base \ + ruby=2.5.2-r0 \ + ruby-dev \ + libffi-dev \ + libxml2-dev && \ + gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk update && \ - apk add binutils=2.30-r1 libtasn1=4.13-r0 + apk add binutils \ + libtasn1 diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile index 249d87e..b518bbb 100644 --- a/base_sdc-elasticsearch/Dockerfile +++ b/base_sdc-elasticsearch/Dockerfile @@ -4,8 +4,16 @@ RUN mkdir -p /var/chef/nodes # Install Chef RUN set -ex && \ - 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 && \ + apk add --no-cache \ + curl \ + vim \ + bash \ + build-base \ + ruby=2.5.2-r0 \ + ruby-dev \ + libffi-dev \ + libxml2-dev && \ + gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk update && \ - apk add binutils=2.30-r1 curl=7.60.0-r1 libcurl=7.60.0-r1 libtasn1=4.13-r0 + apk add binutils curl libcurl libtasn1 diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile index 6a43ef0..2bab202 100644 --- a/base_sdc-jetty/Dockerfile +++ b/base_sdc-jetty/Dockerfile @@ -1,35 +1,35 @@ -FROM jetty:9.3-jre8-alpine +FROM jetty:9.4-jre8-alpine USER root # Install Chef RUN set -ex && \ + apk update && \ apk add --no-cache \ - jq=1.5-r5 \ - curl=7.60.0-r1 \ - curl-dev=7.60.0-r1 \ - 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 && \ + jq \ + curl \ + curl-dev \ + libressl-dev \ + vim=8.1.0115-r0 \ + bash \ + build-base \ + ruby=2.5.2-r0 \ + ruby-dev \ + libffi-dev \ + libxml2-dev && \ gem install \ chef:13.8.5 \ berkshelf:6.3.1 \ io-console:0.4.6 \ + etc webrick \ --no-document && \ echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk update && \ - apk add binutils=2.30-r1 jq=1.6_rc1-r1 libtasn1=4.13-r0 + apk add binutils jq libtasn1 # Replace Jetty user ID COPY set_jetty_user.sh /tmp/set_jetty_user.sh -RUN sh -x /tmp/set_jetty_user.sh && rm -f /tmp/set_jetty_user.sh -RUN chown -R jetty:jetty ${JETTY_BASE}/webapps /var/lib/jetty +RUN sh -x /tmp/set_jetty_user.sh && rm -f /tmp/set_jetty_user.sh && chown -R jetty:jetty ${JETTY_BASE}/webapps /var/lib/jetty USER jetty - diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile index be6c77e..9a349df 100644 --- a/base_sdc-kibana/Dockerfile +++ b/base_sdc-kibana/Dockerfile @@ -42,25 +42,27 @@ RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.lis echo "deb http://security.debian.org buster/updates main" >> /etc/apt/sources.list && \ apt-get -y update && \ apt-get -y --no-install-recommends install \ - vim=2:7.4.488-7+deb8u3 vim-common=2:7.4.488-7+deb8u3 vim-runtime=2:7.4.488-7+deb8u3 \ - bash=4.4.18-3 \ - curl=7.60.0-2 libcurl4=7.60.0-2 \ - krb5-locales=1.16-2 libgssapi-krb5-2=1.16-2 libkrb5-3=1.16-2 libkrb5support0=1.16-2 \ - openssl=1.1.0h-4 \ - perl-base=5.26.2-6 \ - systemd=238-5 \ - wget=1.19.5-1 \ - libdb5.3=5.3.28-13.1+b1 \ - libc-bin=2.27-3 libc6=2.27-3 multiarch-support=2.27-3 \ - libgnutls30=3.5.18-1 \ - libgcrypt20=1.8.2-2 \ - libtasn1-6=4.13-3 \ - libldap-2.4-2=2.4.44+dfsg-5+deb9u1 \ - libpcre3=2:8.39-9 \ - passwd=1:4.5-1 \ - zlib1g=1:1.2.11.dfsg-1 && \ - apt-get -y autoremove - -# install chef-solo -RUN curl -L https://omnitruck.chef.io/install.sh | bash - + vim \ + vim-common \ + vim-runtime \ + bash \ + curl \ + libcurl4 \ + krb5-locales \ + libkrb5-3 \ + #openssl=1.1.0h-4 \ + perl-base \ + systemd \ + wget \ + libdb5.3 \ + libc-bin \ + multiarch-support \ + libgnutls30 \ + libgcrypt20 \ + libtasn1-6 \ + libldap-2.4-2 \ + libpcre3 \ + passwd \ + zlib1g && \ + apt-get -y autoremove && \ + curl -L https://omnitruck.chef.io/install.sh | bash diff --git a/base_sdc-python/Dockerfile b/base_sdc-python/Dockerfile index c774655..21d871e 100644 --- a/base_sdc-python/Dockerfile +++ b/base_sdc-python/Dockerfile @@ -1,17 +1,34 @@ FROM python:2.7-alpine -# Install packages only needed for building -RUN apk add --no-cache libcurl=7.60.0-r1 curl=7.60.0-r1 jq=1.5-r5 libressl-dev=2.6.4-r2 && \ - apk add --no-cache --virtual .build-dependencies build-base=0.5-r0 curl-dev=7.60.0-r1 - # Needed for pycurl ENV PYCURL_SSL_LIBRARY=openssl -# Install Chef -RUN pip install 'influxdb==5.0.0' 'pycurl==7.43.0.1' 'requests==2.18.4' && \ - set -ex && \ - apk add --no-cache bash=4.4.19-r1 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 && \ - echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ - apk update && \ - apk add binutils=2.30-r1 jq=1.6_rc1-r1 libpng=1.6.34-r1 +# Install packages only needed for building +RUN apk update && \ + apk add binutils jq libpng && \ + apk add --no-cache \ + libcurl \ + curl \ + jq \ + libressl-dev \ + bash \ + ruby=2.5.2-r0 \ + ruby-dev \ + libffi-dev \ + libxml2-dev && \ + apk add --no-cache --virtual .build-dependencies \ + build-base \ + curl-dev && \ + pip install 'influxdb==5.0.0' 'pycurl==7.43.0.1' 'requests==2.18.4' && \ + set -ex && \ + gem install \ + chef:13.8.5 \ + berkshelf:6.3.1 \ + io-console:0.4.6 \ + etc webrick \ + --no-document && \ + echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ + + + + diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index 35dff60..600fbf2 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -2,8 +2,16 @@ FROM openjdk:8-jdk-alpine # Install Chef RUN set -ex && \ - 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 && \ + apk add --no-cache \ + curl \ + vim \ + bash \ + build-base \ + ruby=2.5.2-r0 \ + ruby-dev \ + libffi-dev \ + libxml2-dev && \ + gem install chef:13.8.5 berkshelf:6.3.1 io-console:0.4.6 etc webrick --no-document && \ echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk update && \ - apk add binutils=2.30-r1 curl=7.60.0-r1 libcurl=7.60.0-r1 libtasn1=4.13-r0 + apk add binutils curl libcurl libtasn1 diff --git a/base_sdc-vnc/Dockerfile b/base_sdc-vnc/Dockerfile index a834498..9b8c9fe 100644 --- a/base_sdc-vnc/Dockerfile +++ b/base_sdc-vnc/Dockerfile @@ -2,10 +2,4 @@ FROM consol/ubuntu-xfce-vnc:1.3.0 USER 0 -RUN apt-get -y update && apt-get -y install curl=7.47.0-1ubuntu2.8 - -# install chef-solo -RUN curl -L https://www.opscode.com/chef/install.sh | bash - -# install java -RUN apt-get -y update && apt-get -y install default-jre +RUN apt-get -y update && apt-get -y install curl && apt-get -y install chef && apt-get -y update && apt-get -y install default-jre
\ No newline at end of file @@ -5,7 +5,7 @@ <groupId>org.onap.sdc.sdc-docker-base</groupId> <artifactId>sdc-docker-base</artifactId> <packaging>pom</packaging> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdc-sdc-docker-base</name> <properties> diff --git a/version.properties b/version.properties index d709d86..a169fce 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ major=1 minor=4 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} |