From aef4970aa2f66f2b871c748d0e08240ac0396281 Mon Sep 17 00:00:00 2001
From: Andreas Stallinger <astallinger@coati.io>
Date: Fri, 26 Oct 2018 17:49:50 +0200
Subject: [PATCH] build: Updated docker images

---
 .gitlab-ci.yml                                     | 4 ++--
 deployment/dockerfiles/README.md                   | 6 ++++++
 deployment/dockerfiles/linux/centos6_32/Dockerfile | 4 ++--
 deployment/dockerfiles/linux/centos6_64/Dockerfile | 4 ++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 890348da..8176fe21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 variables:
     MAVEN_OPTS: "-Dmaven.repo.local=.m2/repository"
-    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm600
-    IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm600
+    IMAGE_64: coatisoftware/centos6_64_qt_llvm:qt5101-llvm700
+    IMAGE_32: coatisoftware/centos6_32_qt_llvm:qt5101-llvm700
 
 ## Templates ##
 
diff --git a/deployment/dockerfiles/README.md b/deployment/dockerfiles/README.md
index e4a25971..80771980 100644
--- a/deployment/dockerfiles/README.md
+++ b/deployment/dockerfiles/README.md
@@ -18,6 +18,12 @@ docker push <account>/<reponame>:<tag>
 Update Guide
 ============
 
+# delete old docker images
+
+$ docker image ls
+$ docker rmi coatisoftware/centos6_64_qt_llvm:<tag>
+$ docker rmi coatisoftware/centos6_32_qt_llvm:<tag>
+
 # change library version numbers in docker files
 
 # build and upload docker images with new <tag> e.g. qt591-llvm500:
diff --git a/deployment/dockerfiles/linux/centos6_32/Dockerfile b/deployment/dockerfiles/linux/centos6_32/Dockerfile
index 7c212d47..1994c1d0 100755
--- a/deployment/dockerfiles/linux/centos6_32/Dockerfile
+++ b/deployment/dockerfiles/linux/centos6_32/Dockerfile
@@ -61,7 +61,7 @@ CC=gcc \
 DEVTOOLSET=/opt/rh/devtoolset-4/root/usr/
 
 ## Install llvm
-ARG LLVM_VERSION=6.0.0
+ARG LLVM_VERSION=7.0.0
 RUN alias python=/usr/bin/python2.7 && mkdir -p /llvm && cd /llvm && \
 wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
 tar xf llvm-${LLVM_VERSION}.src.tar.xz && \
@@ -93,7 +93,7 @@ rm -rf /botan
 
 ## Boost
 ARG BOOST_MAJOR=1
-ARG BOOST_MINOR=64
+ARG BOOST_MINOR=68
 ARG BOOST_PATCH=0
 ENV BOOST_VERSION=${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH} \
 BOOST_VERSION_UNDERSCORE=${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}
diff --git a/deployment/dockerfiles/linux/centos6_64/Dockerfile b/deployment/dockerfiles/linux/centos6_64/Dockerfile
index 3ccc115e..2f971d2d 100755
--- a/deployment/dockerfiles/linux/centos6_64/Dockerfile
+++ b/deployment/dockerfiles/linux/centos6_64/Dockerfile
@@ -54,7 +54,7 @@ make -j8 && \
 make -j8 install && rm -Rf /qt
 
 ## Install llvm
-ARG LLVM_VERSION=6.0.0
+ARG LLVM_VERSION=7.0.0
 RUN mkdir -p /llvm && cd /llvm && \
 wget http://llvm.org/releases/${LLVM_VERSION}/llvm-${LLVM_VERSION}.src.tar.xz && \
 tar xvf llvm-${LLVM_VERSION}.src.tar.xz && \
@@ -85,7 +85,7 @@ rm -rf /botan
 
 ## Boost
 ARG BOOST_MAJOR=1
-ARG BOOST_MINOR=64
+ARG BOOST_MINOR=68
 ARG BOOST_PATCH=0
 ENV BOOST_VERSION=${BOOST_MAJOR}.${BOOST_MINOR}.${BOOST_PATCH} \
 BOOST_VERSION_UNDERSCORE=${BOOST_MAJOR}_${BOOST_MINOR}_${BOOST_PATCH}