summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2017-11-02 16:07:01 +0000
committerGerrit Code Review <gerrit@onap.org>2017-11-02 16:07:01 +0000
commit2e9060f5c0bf044c49318cf3994eb8fc3c64247c (patch)
tree36745743182295f6eb7a215dce2c7150e94cc059
parentab5e649d37b08e4b2ada4c2e7f4dca4b6bca1e1a (diff)
parent51e21f1f1af41c27567e7d5c404a5db727e589b2 (diff)
Merge "Upgrade docker-compose from 1.9.0 to 1.16.1"
-rw-r--r--boot/portal_install.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/boot/portal_install.sh b/boot/portal_install.sh
index c1b816e0..67512e5c 100644
--- a/boot/portal_install.sh
+++ b/boot/portal_install.sh
@@ -68,7 +68,7 @@ apt-get install -y linux-image-extra-$(uname -r) linux-image-extra-virtual
apt-get install -y --allow-unauthenticated docker-engine
mkdir /opt/docker
-curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
+curl -L https://github.com/docker/compose/releases/download/1.16.1/docker-compose-`uname -s`-`uname -m` > /opt/docker/docker-compose
chmod +x /opt/docker/docker-compose
# Set the MTU size of docker containers to the minimum MTU size supported by vNICs. OpenStack deployments may need to know the external DNS IP
@@ -92,8 +92,7 @@ echo "nameserver "$DNS_IP_ADDR >> /etc/resolvconf/resolv.conf.d/head
resolvconf -u
# Clone Gerrit repository and run docker containers
-mkdir -p /PROJECT/OpenSource/UbuntuEP/logs
cd /opt
git clone -b $GERRIT_BRANCH --single-branch $CODE_REPO
-./portal_vm_init.sh \ No newline at end of file
+./portal_vm_init.sh