build: Updated docker images

This commit is contained in:
Andreas Stallinger
2018-10-26 17:49:50 +02:00
parent f7b77b6f9c
commit aef4970aa2
4 changed files with 12 additions and 6 deletions
+6
View File
@@ -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:
@@ -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}
@@ -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}