Merge branch 'feature/cpp-17' into 'master'

Update images to support C++17 See merge request docker-images/gr-build-images!25

Merge branch 'feature/cpp-17' into 'master'
1f085530 · Ingo Meyer · 2c22de15 · b35b0335 · 1f085530 · 1f085530
Commit 1f085530 authored 2 years ago by Ingo Meyer
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
 ubuntu-self-contained:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 ubuntu-system-dependencies:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 debian-self-contained:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 debian-system-dependencies:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 debian-self-contained-armhf:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross

 debian-system-dependencies-armhf:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME-cross

 debian-self-contained-aarch64:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 centos7-self-contained:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 centos7-system-dependencies:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 centos7-32bit-self-contained:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 centos7-32bit-system-dependencies:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 arch-self-contained:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 arch-system-dependencies:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 windows-32bit-cross:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 windows-64bit-cross:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 emscripten:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 code-style-check:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 deploy:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 deploy-to-obs:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME

 deploy-to-aur:
  image: docker:stable
  script:
-    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+    - docker build -t $CI_REGISTRY_IMAGE/$CI_JOB_NAME $CI_JOB_NAME
    - docker push $CI_REGISTRY_IMAGE/$CI_JOB_NAME
--- a/centos7-32bit-self-contained/Dockerfile
+++ b/centos7-32bit-self-contained/Dockerfile
-FROM i386/centos:7
+FROM iffregistry.fz-juelich.de/imeyer/gcc_build/centos:7-i386-gcc-8.5.0

 COPY basearch /etc/yum/vars/basearch


--- a/centos7-32bit-system-dependencies/Dockerfile
+++ b/centos7-32bit-system-dependencies/Dockerfile
-FROM i386/centos:7
+FROM iffregistry.fz-juelich.de/imeyer/gcc_build/centos:7-i386-gcc-8.5.0

 COPY basearch /etc/yum/vars/basearch


--- a/centos7-self-contained/Dockerfile
+++ b/centos7-self-contained/Dockerfile
@@ -3,4 +3,6 @@ FROM centos:7
 RUN yum update -y && \
    yum groupinstall -y "Development Tools" && \
    yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ mesa-libGL-devel libXt-devel libX11-devel libXrender-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel qt5-qtbase-devel gtk2-devel qt-devel nasm
+    yum install -y which gcc gcc-c++ mesa-libGL-devel libXt-devel libX11-devel libXrender-devel libXrandr-devel libXinerama-devel libXcursor-devel libXi-devel qt5-qtbase-devel gtk2-devel qt-devel nasm && \
+    yum install -y centos-release-scl && \
+    yum install -y devtoolset-8
--- a/centos7-system-dependencies/Dockerfile
+++ b/centos7-system-dependencies/Dockerfile
@@ -3,4 +3,6 @@ FROM centos:7
 RUN yum update -y && \
    yum groupinstall -y "Development Tools" && \
    yum groupinstall -y "X Window System" && \
-    yum install -y which gcc gcc-c++ cmake patch PyQt4-devel ghostscript-devel texlive-collection-latex texlive-dvipng cairo-devel git
+    yum install -y which gcc gcc-c++ cmake patch PyQt4-devel ghostscript-devel texlive-collection-latex texlive-dvipng cairo-devel git && \
+    yum install -y centos-release-scl && \
+    yum install -y devtoolset-8
--- a/debian-self-contained-aarch64/Dockerfile
+++ b/debian-self-contained-aarch64/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \

--- a/debian-self-contained-armhf/Dockerfile
+++ b/debian-self-contained-armhf/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \

--- a/debian-self-contained/Dockerfile
+++ b/debian-self-contained/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
+    DEBIAN_FRONTEND=noninteractive \
    apt-get install -y wget make patch gcc g++ xz-utils lbzip2 libgl1-mesa-dev libglu1-mesa-dev xorg-dev git qt5-default libgtk2.0-dev gtk2.0-examples libwxgtk3.0-dev qt4-dev-tools qtbase5-dev nasm && \
    rm -rf /var/lib/apt/lists/*
--- a/debian-system-dependencies-armhf/Dockerfile
+++ b/debian-system-dependencies-armhf/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
    apt-get install -y binfmt-support qemu-user-static && \
    dpkg --add-architecture armhf && \
    apt-get update && \
-    apt-get install -y wget make gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libx11-dev:armhf libxft-dev:armhf libxt-dev:armhf python2.7:armhf texlive-latex3 dvipng:armhf libgl1-mesa-dev:armhf libgs-dev:armhf libgtk2.0-dev:armhf libwxgtk3.0-dev:armhf libglfw3-dev:armhf libzmq3-dev:armhf cmake git libavcodec-dev:armhf libavutil-dev:armhf libswscale-dev:armhf libavformat-dev:armhf qt5-default:armhf qt4-dev-tools:armhf qt4-qmake:armhf qtbase5-dev:armhf qtbase5-dev-tools:armhf && \
+    apt-get install -y wget make gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf libx11-dev:armhf libxft-dev:armhf libxt-dev:armhf python2.7:armhf texlive-latex-recommended dvipng:armhf libgl1-mesa-dev:armhf libgs-dev:armhf libgtk2.0-dev:armhf libwxgtk3.0-dev:armhf libglfw3-dev:armhf libzmq3-dev:armhf cmake git libavcodec-dev:armhf libavutil-dev:armhf libswscale-dev:armhf libavformat-dev:armhf qt5-default:armhf qt4-dev-tools:armhf qt4-qmake:armhf qtbase5-dev:armhf qtbase5-dev-tools:armhf && \
    rm -rf /var/lib/apt/lists/*
--- a/debian-system-dependencies/Dockerfile
+++ b/debian-system-dependencies/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex3 dvipng libgl1-mesa-dev qt4-dev-tools pyqt4-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex-recommended dvipng libgl1-mesa-dev qt4-dev-tools pyqt4-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
    rm -rf /var/lib/apt/lists/*
--- a/emscripten/Dockerfile
+++ b/emscripten/Dockerfile
@@ -2,7 +2,15 @@ FROM ubuntu:18.04

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y git make python3 cmake nodejs default-jre build-essential && \
+    apt-get install -y \
+        build-essential \
+        cmake \
+        curl \
+        default-jre \
+        git \
+        make \
+        nodejs \
+        python3 && \
    rm -rf /var/lib/apt/lists/* && \
    git clone https://github.com/juj/emsdk.git && \
    cd emsdk && \

--- a/ubuntu-self-contained/Dockerfile
+++ b/ubuntu-self-contained/Dockerfile
-FROM ubuntu:18.04
+FROM ubuntu:20.04

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y wget make gcc g++ libgl1-mesa-dev libglu1-mesa-dev xorg-dev git qt5-default libgtk2.0-dev gtk2.0-examples libwxgtk3.0-dev qt4-dev-tools qtbase5-dev nasm libidn11-dev && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y wget make gcc g++ libgl1-mesa-dev libglu1-mesa-dev xorg-dev git qt5-default libgtk2.0-dev gtk2.0-examples libwxgtk3.0-gtk3-dev qtbase5-dev nasm libidn11-dev && \
    rm -rf /var/lib/apt/lists/*
--- a/ubuntu-system-dependencies/Dockerfile
+++ b/ubuntu-system-dependencies/Dockerfile
-FROM ubuntu:18.04
+FROM ubuntu:20.04

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex-recommended dvipng libgl1-mesa-dev qt4-dev-tools pyqt4-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
+    DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y wget make gcc g++ libx11-dev libxft-dev libxt-dev python2.7 texlive-latex-recommended dvipng libgl1-mesa-dev qt5-default qtbase5-dev pyqt5-dev-tools libgs-dev libgtk2.0-dev libwxgtk3.0-gtk3-dev libglfw3-dev libzmq3-dev cmake git libavcodec-dev libavutil-dev libswscale-dev libavformat-dev && \
    rm -rf /var/lib/apt/lists/*
--- a/windows-32bit-cross/Dockerfile
+++ b/windows-32bit-cross/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git qtbase5-dev-tools qt5-default && \
+    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git && \
    rm -rf /var/lib/apt/lists/*
+
+RUN wget "https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz" && \
+    tar -C/usr/local --strip-components=1 -xvf "qt5.15.2-linux-x86_64-bin.tar.gz" && \
+    rm -rf "qt5.15.2-linux-x86_64-bin.tar.gz"
--- a/windows-64bit-cross/Dockerfile
+++ b/windows-64bit-cross/Dockerfile
-FROM debian:9
+FROM debian:10

 RUN apt-get update && \
    apt-get dist-upgrade -y && \
-    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git qtbase5-dev-tools qt5-default && \
+    apt-get install -y wget make mingw-w64 pkg-config xorg-dev g++ gcc cmake xz-utils lbzip2 patch git && \
    rm -rf /var/lib/apt/lists/*
+
+RUN wget "https://gr-framework.org/downloads/3rdparty/qt5.15.2-linux-x86_64-bin.tar.gz" && \
+    tar -C/usr/local --strip-components=1 -xvf "qt5.15.2-linux-x86_64-bin.tar.gz" && \
+    rm -rf "qt5.15.2-linux-x86_64-bin.tar.gz"