summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-05-10 07:47:22 -0700
committerGary Wu <gary.i.wu@huawei.com>2018-05-11 12:39:19 -0700
commit79dd5f998b4525a4cde5eefe5d8175f3b1f3a975 (patch)
tree92a5e1d1b55a274a62115f68a35bd6cdd1f66978
parentf5397220a48a770aa2ccca10ffb49a88621c74fa (diff)
Add stretch repos to debian repo list
It appears that zlib1g=1:1.2.8.dfsg-5 has disappeared off of the buster repos, and is now found in stretch repos. Add the stretch repos so that this library version can be installed. libldap-2.4-2=2.4.45+dfsg-1 also disappeared and was replaced with a different version. Change-Id: Ifb1c83033e69d9b2343a262d3efa16007a30f89d Issue-ID: SDC-1221 Issue-ID: SDC-1205 Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
-rw-r--r--base_sdc-cassandra/Dockerfile7
-rw-r--r--base_sdc-kibana/Dockerfile7
2 files changed, 10 insertions, 4 deletions
diff --git a/base_sdc-cassandra/Dockerfile b/base_sdc-cassandra/Dockerfile
index ea80f65..052d9b8 100644
--- a/base_sdc-cassandra/Dockerfile
+++ b/base_sdc-cassandra/Dockerfile
@@ -46,7 +46,10 @@ 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 buster main" >> /etc/apt/sources.list && \
+RUN 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 && \
@@ -72,7 +75,7 @@ RUN echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
libgcrypt20=1.8.2-2 \
libtasn1-6=4.13-2 \
libxi6=2:1.7.9-1 \
- libldap-2.4-2=2.4.45+dfsg-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.8.dfsg-5 && \
diff --git a/base_sdc-kibana/Dockerfile b/base_sdc-kibana/Dockerfile
index 977ef73..f2ec28d 100644
--- a/base_sdc-kibana/Dockerfile
+++ b/base_sdc-kibana/Dockerfile
@@ -34,7 +34,10 @@ 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 buster main" >> /etc/apt/sources.list && \
+RUN 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 && \
@@ -52,7 +55,7 @@ RUN echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
libgnutls30=3.5.18-1 \
libgcrypt20=1.8.2-2 \
libtasn1-6=4.13-2 \
- libldap-2.4-2=2.4.45+dfsg-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.8.dfsg-5 && \