ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build: Updated Travis CI docker image to LLVM/Clang 10.0.0 (#1033)

Browse Source
This commit is contained in:
Eberhard Gräther
2020-06-07 16:44:14 +02:00
committed by GitHub
parent a12deb2056
commit e7fc3d205d
3 changed files with 20 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/dockerfiles/README.md
+14 -9
View File
@@ -15,14 +15,20 @@ docker login
docker push <account>/<reponame>:<tag>
Run docker images
-----------------
docker run -it <image> /bin/bash
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>
$ docker rmi coatisoftware/centos7_64_qt_llvm:<tag>
$ docker rmi coatisoftware/centos7_32_qt_llvm:<tag>
# docker clean up
@@ -32,18 +38,17 @@ $ docker system prune
# build and upload docker images with new <tag> e.g. qt591-llvm500:
$ cd deployment/dockerfiles/linux/centos6_64
$ docker build -t coatisoftware/centos6_64_qt_llvm:<tag> .
$ cd deployment/dockerfiles/linux/centos7_64
$ docker build -t coatisoftware/centos7_64_qt_llvm:<tag> .
$ docker login
$ docker push coatisoftware/centos6_64_qt_llvm:<tag>
$ docker push coatisoftware/centos7_64_qt_llvm:<tag>
$ cd ../centos6_32
$ docker build -t coatisoftware/centos6_32_qt_llvm:<tag> .
$ cd ../centos7_32
$ docker build -t coatisoftware/centos7_32_qt_llvm:<tag> .
$ docker push coatisoftware/centos6_32_qt_llvm:<tag>
$ docker push coatisoftware/centos7_32_qt_llvm:<tag>
# update <tag> of linux images in .gitlab-ci.yml
# commit and publish changes
deployment/dockerfiles/linux/centos7_64/Dockerfile
+6 -9
View File
@@ -57,18 +57,15 @@ make -j8 install && rm -Rf /qt
# LLVM/Clang
ARG LLVM_VERSION=10.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 && \
cd llvm-${LLVM_VERSION}.src && \
cd tools && \
wget http://llvm.org/releases/${LLVM_VERSION}/cfe-${LLVM_VERSION}.src.tar.xz && \
tar xvf cfe-${LLVM_VERSION}.src.tar.xz && \
wget https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVM_VERSION}/llvm-project-${LLVM_VERSION}.tar.xz && \
tar xvf llvm-project-${LLVM_VERSION}.tar.xz && \
cd llvm-project-${LLVM_VERSION} && \
. /opt/rh/python27/enable && \
. /opt/rh/devtoolset-7/enable && \
python --version && \
cd /llvm/llvm-${LLVM_VERSION}.src && mkdir -p build && cd build && \
cmake .. -DCMAKE_INSTALL_PREFIX=/opt/llvm/ \
mkdir -p build && cd build && \
cmake ../llvm -DCMAKE_INSTALL_PREFIX=/opt/llvm/ \
-DCMAKE_BUILD_TYPE=Release \
-DLLVM_ENABLE_PROJECTS="clang" \
-DLLVM_ENABLE_RTTI=ON \
&& make -j8 install && rm -Rf /llvm
deployment/dockerfiles/linux/travis_ci/Dockerfile
-16
View File
@@ -1,21 +1,5 @@
FROM coatisoftware/centos7_64_qt_llvm:qt5126-llvm1000
# TODO: remove after full image rebuilt ------------------------------------
USER root
RUN yum -y install file
RUN wget https://github.com/probonopd/linuxdeployqt/releases/download/6/linuxdeployqt-6-x86_64.AppImage && \
chmod a+x linuxdeployqt-6-x86_64.AppImage && \
./linuxdeployqt-6-x86_64.AppImage --appimage-extract && \
cp -r squashfs-root/usr/ /opt/linuxdeployqt && \
chmod -R 755 /opt/linuxdeployqt && \
rm linuxdeployqt-6-x86_64.AppImage && rm -rf squashfs-root
ENV PATH=/opt/linuxdeployqt/bin:${PATH}
USER builder
# --------------------------------------------------------------------------
COPY entrypoint.sh /entrypoint.sh
ENTRYPOINT ["/entrypoint.sh"]