summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomáš Levora <t.levora@partner.samsung.com>2019-05-15 13:38:00 +0200
committerTomáš Levora <t.levora@partner.samsung.com>2019-05-17 12:22:09 +0000
commita82fa0d6493888a8e5b29f2c87d6675fddf0c1a9 (patch)
tree21622335dd62f3146632e82e326d440b7e129fa5
parent8fd23141ffc7dd2f3c02b62e8fed1ff8364319b0 (diff)
Update of docker for RHEL
Updating docker to 18.09 and its dependencies accordingly Issue-ID: OOM-1857 Change-Id: Ifa3ee7091e2ceeecf8c56d48c31a20a33d273f43 Signed-off-by: Tomáš Levora <t.levora@partner.samsung.com>
-rwxr-xr-xbuild/creating_data/create-rhel-repo.sh12
-rw-r--r--docs/BuildGuide.rst4
2 files changed, 7 insertions, 9 deletions
diff --git a/build/creating_data/create-rhel-repo.sh b/build/creating_data/create-rhel-repo.sh
index ca5a5352..43709a7e 100755
--- a/build/creating_data/create-rhel-repo.sh
+++ b/build/creating_data/create-rhel-repo.sh
@@ -1,6 +1,6 @@
# COPYRIGHT NOTICE STARTS HERE
#
-# Copyright 2018 © Samsung Electronics Co., Ltd.
+# Copyright 2018-2019 © Samsung Electronics Co., Ltd.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -36,12 +36,10 @@ fi
# this exact docker version is required by ONAP/beijing
# it should be available in centos docker repo
-yumdownloader --resolve --destdir="${OUTDIR}" docker-ce-17.03.2.ce libtool-ltdl docker-ce-selinux nfs-utils python-jsonpointer
-
-wget https://cbs.centos.org/kojifiles/packages/python-docker/2.5.1/2.el7/noarch/python2-docker-2.5.1-2.el7.noarch.rpm -P "${OUTDIR}"
-
-yum install --downloadonly --downloaddir="${OUTDIR}" "${OUTDIR}/python2-docker-2.5.1-2.el7.noarch.rpm"
+yumdownloader --resolve --destdir="${OUTDIR}" docker-ce-18.09.5 container-selinux docker-ce-cli \
+containerd.io nfs-utils python-jsonpointer python-docker-py python-docker-pycreds python-ipaddress \
+python-websocket-client
createrepo "${OUTDIR}"
-exit 0
+exit 0 \ No newline at end of file
diff --git a/docs/BuildGuide.rst b/docs/BuildGuide.rst
index c79c0b04..8ae08d8d 100644
--- a/docs/BuildGuide.rst
+++ b/docs/BuildGuide.rst
@@ -29,7 +29,7 @@ More-over following sw packages has to be installed:
* for the Download artifacts for offline installer (Part 2) and the Populate local nexus (Part 3)
- nodejs
- jq
- - docker (exact version docker-ce-17.03.2)
+ - docker (exact version docker-ce-18.09.5)
* for the Download artifacts for offline installer (Part 2) and for the Application helm charts preparation and patching (Part 4)
- patch
@@ -75,7 +75,7 @@ Subsequent steps are the same on both platforms:
pip install twine
# install docker
- curl https://releases.rancher.com/install-docker/17.03.sh | sh
+ curl https://releases.rancher.com/install-docker/18.09.sh | sh
Then it is necessary to clone all installer and build related repositories and prepare the directory structure.