Skip to content

Commit

Permalink
ci: fix build containers
Browse files Browse the repository at this point in the history
  • Loading branch information
variar committed May 14, 2022
1 parent 78a79c8 commit 17a8794
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions docker/ubuntu20.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@ RUN apt update -y && \
add-apt-repository ppa:ubuntu-toolchain-r/test -y && \
apt update -y

RUN apt install gcc-9 g++-9 \
RUN apt install gcc-11 g++-11 \
qtbase5-dev qt5-qmake qtbase5-dev-tools libicu-dev \
ragel ninja-build zlib1g-dev git \
wget fuse -y && \
apt clean && rm -rf /var/lib/apt/lists/*

RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 --slave /usr/bin/g++ g++ /usr/bin/g++-11

RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-linux-x86_64.sh && \
chmod 755 cmake-3.20.2-linux-x86_64.sh && \
Expand Down
2 changes: 1 addition & 1 deletion docker/ubuntu22.04/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN apt install gcc-11 g++-11 \
wget fuse -y && \
apt clean && rm -rf /var/lib/apt/lists/*

RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 60 --slave /usr/bin/g++ g++ /usr/bin/g++-9
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-11 60 --slave /usr/bin/g++ g++ /usr/bin/g++-11

RUN wget https://github.com/Kitware/CMake/releases/download/v3.20.2/cmake-3.20.2-linux-x86_64.sh && \
chmod 755 cmake-3.20.2-linux-x86_64.sh && \
Expand Down

0 comments on commit 17a8794

Please sign in to comment.