diff options
| author |   Denis Kasanic <denis.kasanic@tieto.com> | 2019-09-20 13:22:41 +0200 |
|---|---|---|
| committer | Denis Kasanic <denis.kasanic@tieto.com> | 2019-09-20 14:02:41 +0200 |
| commit | 6cdcb857261019e1dbd154fe6f27a68b124cfb4a (patch) | |
| tree | 7fb2bf5e7b73ad40320bef5efe41a603cc195f6f | |
| parent | 639278ba4ddea0ca7402839bc2e49ac70f2e14ef (diff) | |
Fix build failure of base images5.0.2-ONAPelalto
Upgrade of Alpine linux version of the openjdk:8-jdk-alpine
base image obsoleted usage of edge repositories.
These repositories were causing build failures.
Elasticsearch newly requires an installation of linux-headers package.
This package is required to build dependencies for plugin berkshelf.
Issue-ID: SDC-2581
Signed-off-by: Denis Kasanic <denis.kasanic@tieto.com>
Change-Id: Ib71846d4d449f035cf7633c8ac786553364efef7
| -rw-r--r-- | base_sdc-cqlsh/Dockerfile | 1 | ||||
| -rw-r--r-- | base_sdc-elasticsearch/Dockerfile | 1 | ||||
| -rw-r--r-- | base_sdc-jetty/Dockerfile | 1 | ||||
| -rw-r--r-- | base_sdc-python/Dockerfile | 3 | ||||
| -rw-r--r-- | base_sdc-sanity/Dockerfile | 1 |
5 files changed, 2 insertions, 5 deletions
diff --git a/base_sdc-cqlsh/Dockerfile b/base_sdc-cqlsh/Dockerfile index 9595764..7cc7566 100644 --- a/base_sdc-cqlsh/Dockerfile +++ b/base_sdc-cqlsh/Dockerfile @@ -1,7 +1,6 @@ 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 && \ diff --git a/base_sdc-elasticsearch/Dockerfile b/base_sdc-elasticsearch/Dockerfile index 15c9746..e505991 100644 --- a/base_sdc-elasticsearch/Dockerfile +++ b/base_sdc-elasticsearch/Dockerfile @@ -5,6 +5,7 @@ RUN mkdir -p /var/chef/nodes # Install Chef RUN set -ex && \ apk add --no-cache \ + linux-headers \ curl \ vim \ bash \ diff --git a/base_sdc-jetty/Dockerfile b/base_sdc-jetty/Dockerfile index df05d8f..3c761bf 100644 --- a/base_sdc-jetty/Dockerfile +++ b/base_sdc-jetty/Dockerfile @@ -4,7 +4,6 @@ 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 \ diff --git a/base_sdc-python/Dockerfile b/base_sdc-python/Dockerfile index f80ffe0..353446c 100644 --- a/base_sdc-python/Dockerfile +++ b/base_sdc-python/Dockerfile @@ -4,8 +4,7 @@ FROM python:2.7-alpine ENV PYCURL_SSL_LIBRARY=openssl # Install packages only needed for building -RUN echo "http://nl.alpinelinux.org/alpine/edge/main" >> /etc/apk/repositories && \ - apk update && \ +RUN apk update && \ apk add binutils jq libpng && \ apk add --no-cache \ libcurl \ diff --git a/base_sdc-sanity/Dockerfile b/base_sdc-sanity/Dockerfile index 77f0da9..635e2c6 100644 --- a/base_sdc-sanity/Dockerfile +++ b/base_sdc-sanity/Dockerfile @@ -2,7 +2,6 @@ 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 \ |