From 8a3e3fc5dcc615044980586501c3a84031fc9513 Mon Sep 17 00:00:00 2001 From: Tomasz Golabek Date: Fri, 14 Jun 2019 15:41:22 +0200 Subject: Fixed Dockerfiles for base images Dockerfiles for building base images of sdc components fixed. Change-Id: I50057d3edba1c06e6175e5cc547981efb11ecac3 Issue-ID: SDC-2367 Signed-off-by: Tomasz Golabek --- base_sdc-cassandra/Dockerfile | 12 ++++++++---- base_sdc-cqlsh/Dockerfile | 5 ++--- base_sdc-elasticsearch/Dockerfile | 2 +- base_sdc-jetty/Dockerfile | 7 +++---- base_sdc-kibana/Dockerfile | 9 ++++++--- base_sdc-python/Dockerfile | 9 +++++---- base_sdc-sanity/Dockerfile | 4 ++-- 7 files changed, 27 insertions(+), 21 deletions(-) diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile index 8db29b3..6dddaa7 100644 --- a/base_sdc-cassandra/Dockerfile +++ b/base_sdc-cassandra/Dockerfile @@ -46,18 +46,22 @@ FROM cassandra:2.1.17 # zlib1g # CVE-2016-9843 CVE-2016-9841 CVE-2016-9842 CVE-2016-9840 -RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.list && \ +RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list && \ + sed -i '/deb http:\/\/deb.debian.org\/debian jessie-backports main/d' /etc/apt/sources.list.d/backports.list && \ + echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ + echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian stretch-updates main" >> /etc/apt/sources.list && \ echo "deb http://security.debian.org stretch/updates main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ echo "deb http://security.debian.org buster/updates main" >> /etc/apt/sources.list && \ - apt-get -y update && \ + apt-get -o Acquire::Check-Valid-Until=false update && \ + apt-get -y install -t jessie-backports ca-certificates-java && \ + apt-get -y install -t jessie-backports openjdk-8-jre-headless && \ apt-get -y --no-install-recommends install \ vim \ vim-runtime \ apt-utils \ - openjdk-8-jdk \ libavahi-client3 \ libavahi-common3 \ curl \ @@ -94,5 +98,5 @@ RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.lis 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 + curl -L https://omnitruck.chef.io/install.sh | bash -s -- -v 13.8.5 diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile index 5451a66..9595764 100644 --- a/base_sdc-cqlsh/Dockerfile +++ b/base_sdc-cqlsh/Dockerfile @@ -1,19 +1,18 @@ FROM openjdk:8-jdk-alpine RUN apk add --no-cache py-pip && \ + echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ pip install cqlsh==4.0.1 && \ set -ex && \ pip install cqlsh && \ - apk add --no-cache \ bash \ build-base \ - ruby=2.5.2-r0 \ + ruby=2.5.5-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 \ libtasn1 diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile index b518bbb..15c9746 100644 --- a/base_sdc-elasticsearch/Dockerfile +++ b/base_sdc-elasticsearch/Dockerfile @@ -9,7 +9,7 @@ RUN set -ex && \ vim \ bash \ build-base \ - ruby=2.5.2-r0 \ + ruby=2.5.5-r0 \ ruby-dev \ libffi-dev \ libxml2-dev && \ diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile index 2bab202..df05d8f 100644 --- a/base_sdc-jetty/Dockerfile +++ b/base_sdc-jetty/Dockerfile @@ -2,19 +2,19 @@ FROM jetty:9.4-jre8-alpine USER root - # Install Chef RUN set -ex && \ + echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk update && \ apk add --no-cache \ jq \ curl \ curl-dev \ libressl-dev \ - vim=8.1.0115-r0 \ + vim \ bash \ build-base \ - ruby=2.5.2-r0 \ + ruby=2.5.5-r0 \ ruby-dev \ libffi-dev \ libxml2-dev && \ @@ -24,7 +24,6 @@ RUN set -ex && \ 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 jq libtasn1 diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile index 9a349df..7faba33 100644 --- a/base_sdc-kibana/Dockerfile +++ b/base_sdc-kibana/Dockerfile @@ -34,13 +34,16 @@ FROM kibana:4.3.3 # zlib1g # CVE-2016-9843 CVE-2016-9841 CVE-2016-9842 CVE-2016-9840 -RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.list && \ +RUN sed -i '/deb http:\/\/deb.debian.org\/debian jessie-updates main/d' /etc/apt/sources.list && \ + sed -i '/deb http:\/\/deb.debian.org\/debian jessie-backports main/d' /etc/apt/sources.list && \ + echo "deb [check-valid-until=no] http://archive.debian.org/debian jessie-backports main" >> /etc/apt/sources.list && \ + echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian stretch-updates main" >> /etc/apt/sources.list && \ echo "deb http://security.debian.org stretch/updates main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list && \ echo "deb http://deb.debian.org/debian buster-updates main" >> /etc/apt/sources.list && \ echo "deb http://security.debian.org buster/updates main" >> /etc/apt/sources.list && \ - apt-get -y update && \ + apt-get -o Acquire::Check-Valid-Until=false update && \ apt-get -y --no-install-recommends install \ vim \ vim-common \ @@ -65,4 +68,4 @@ RUN echo "deb http://deb.debian.org/debian stretch main" >> /etc/apt/sources.lis passwd \ zlib1g && \ apt-get -y autoremove && \ - curl -L https://omnitruck.chef.io/install.sh | bash + curl -L https://omnitruck.chef.io/install.sh | bash -s -- -v 13.8.5 diff --git a/base_sdc-python/Dockerfile b/base_sdc-python/Dockerfile index 21d871e..f80ffe0 100644 --- a/base_sdc-python/Dockerfile +++ b/base_sdc-python/Dockerfile @@ -4,7 +4,8 @@ FROM python:2.7-alpine ENV PYCURL_SSL_LIBRARY=openssl # Install packages only needed for building -RUN apk update && \ +RUN echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ + apk update && \ apk add binutils jq libpng && \ apk add --no-cache \ libcurl \ @@ -12,7 +13,7 @@ RUN apk update && \ jq \ libressl-dev \ bash \ - ruby=2.5.2-r0 \ + ruby=2.5.5-r0 \ ruby-dev \ libffi-dev \ libxml2-dev && \ @@ -26,8 +27,8 @@ RUN apk update && \ berkshelf:6.3.1 \ io-console:0.4.6 \ etc webrick \ - --no-document && \ - echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories \ + --no-document + diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index 600fbf2..77f0da9 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -2,16 +2,16 @@ FROM openjdk:8-jdk-alpine # Install Chef RUN set -ex && \ + echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ apk add --no-cache \ curl \ vim \ bash \ build-base \ - ruby=2.5.2-r0 \ + ruby=2.5.5-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 curl libcurl libtasn1 -- cgit 1.2.3-korg