aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIvan Komissarov <ABBAPOH@gmail.com>2024-02-23 18:09:15 +0100
committerIvan Komissarov <ABBAPOH@gmail.com>2024-02-27 19:38:25 +0000
commitd174c2631b9e53fd14787983a1eea0a91c043c84 (patch)
tree2ef433157f868db306dcef886a9fce3482cabcab
parent43ed89e71a892d160eaa6fcf7c2bdc51f5f50cb7 (diff)
docker: remove Focal image
Change-Id: I9cc2a4dd7c2baef682cead318d711e7cedb898cc Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r--.github/workflows/main.yml12
-rw-r--r--docker-compose.yml11
-rw-r--r--docker/focal/Dockerfile117
-rwxr-xr-xdocker/focal/entrypoint.sh96
4 files changed, 0 insertions, 236 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2c8e21e35..20e936d8d 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -16,18 +16,6 @@ jobs:
matrix:
config:
- {
- name: 'Build on Linux (gcc)',
- image: 'focal-qt6',
- options: 'modules.cpp.compilerWrapper:ccache
- modules.qbs.debugInformation:true
- modules.qbsbuildconfig.enableBundledQt:true
- products.qbs_archive.targetName:qbs-linux-${{ github.run_id }}
- products.qbs_archive.includeTests:true',
- script: './scripts/build-qbs-with-qbs.sh',
- cacheid: 'gcc-qt6',
- suffix: 'linux',
- }
- - {
name: 'Build on Linux (Jammy, gcc)',
image: 'jammy-qt6',
options: 'modules.cpp.compilerWrapper:ccache
diff --git a/docker-compose.yml b/docker-compose.yml
index 27d334647..d852cc5e6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -54,17 +54,6 @@ services:
QT_VERSION: 6.5.0
QTCREATOR_VERSION: 11.0.3
- focal-qt6:
- << : *linux
- hostname: focal-qt6
- image: ${DOCKER_USER:-qbsbuild}/qbsdev:focal-qt6-6.5.0_1.24.1-0
- build:
- dockerfile: docker/focal/Dockerfile
- context: .
- args:
- QT_VERSION: 6.5.0
- QTCREATOR_VERSION: 9.0.2
-
jammy-android-515:
<< : *linux
hostname: jammy-android
diff --git a/docker/focal/Dockerfile b/docker/focal/Dockerfile
deleted file mode 100644
index 917d4d0a7..000000000
--- a/docker/focal/Dockerfile
+++ /dev/null
@@ -1,117 +0,0 @@
-#
-# Install Qt and Qbs for Linux
-#
-FROM ubuntu:focal
-LABEL Description="Ubuntu development environment for Qbs with Qt and various dependencies for testing Qbs modules and functionality"
-ARG QT_VERSION
-ARG QTCREATOR_VERSION
-
-# Allow colored output on command line.
-ENV TERM=xterm-color
-
-#
-# Make it possible to change UID/GID in the entrypoint script. The docker
-# container usually runs as root user on Linux hosts. When the Docker container
-# mounts a folder on the host and creates files there, those files would be
-# owned by root instead of the current user. Thus we create a user here who's
-# UID will be changed in the entrypoint script to match the UID of the current
-# host user.
-#
-ARG USER_UID=1000
-ARG USER_NAME=devel
-RUN apt-get update -qq && \
- apt-get install -qq -y \
- ca-certificates \
- gosu \
- sudo && \
- groupadd -g ${USER_UID} ${USER_NAME} && \
- useradd -s /bin/bash -u ${USER_UID} -g ${USER_NAME} -o -c "" -m ${USER_NAME} && \
- usermod -a -G sudo ${USER_NAME} && \
- echo "%devel ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers
-
-COPY docker/focal/entrypoint.sh /sbin/entrypoint.sh
-ENTRYPOINT ["/sbin/entrypoint.sh"]
-
-# Qbs build dependencies
-RUN apt-get update -qq && \
- DEBIAN_FRONTEND="noninteractive" apt-get install -qq -y --no-install-recommends \
- bison \
- build-essential \
- ca-certificates \
- capnproto \
- ccache \
- clang-12 \
- clang-tidy-12 \
- cmake \
- curl \
- flex \
- git \
- help2man \
- icoutils \
- libcapnp-dev \
- libdbus-1-3 \
- libfreetype6 \
- libfontconfig1 \
- libgl1-mesa-dev \
- libgl1-mesa-glx \
- libnanopb-dev \
- libprotobuf-dev \
- libgrpc++-dev \
- libxkbcommon-x11-0 \
- locales \
- nanopb \
- ninja-build \
- nsis \
- pkg-config \
- protobuf-compiler \
- protobuf-compiler-grpc \
- psmisc \
- python3-pip \
- python3-setuptools \
- p7zip-full \
- subversion \
- unzip \
- zip && \
- update-alternatives --install /usr/bin/clang clang /usr/bin/clang-12 100 && \
- update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-12 100 && \
- update-alternatives --install /usr/bin/clang-check clang-check /usr/bin/clang-check-12 100 && \
- update-alternatives --install /usr/bin/python python /usr/bin/python3 100 && \
- pip install beautifulsoup4 lxml protobuf==3.19.1 pyyaml
-
-# Set the locale
-RUN sed -i '/en_US.UTF-8/s/^# //g' /etc/locale.gen && \
- locale-gen
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
-
-ENV LLVM_INSTALL_DIR=/usr/lib/llvm-12
-
-
-#
-# Install Qt and Qbs for Linux from qt.io
-#
-COPY scripts/install-qt.sh install-qt.sh
-
-RUN ./install-qt.sh --version ${QT_VERSION} qtbase qtdeclarative qttools qtx11extras qtscxml qt5compat icu && \
- ./install-qt.sh --version ${QTCREATOR_VERSION} qtcreator && \
- echo "export PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:\${PATH}" > /etc/profile.d/qt.sh
-
-ENV PATH=/opt/Qt/${QT_VERSION}/gcc_64/bin:/opt/Qt/Tools/QtCreator/bin:${PATH}
-
-
-# Configure Qbs
-USER $USER_NAME
-RUN qbs-setup-toolchains /usr/bin/g++ gcc && \
- qbs-setup-toolchains /usr/bin/clang clang && \
- qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-gcc_64 && \
- qbs config profiles.qt-gcc_64.baseProfile gcc && \
- qbs-setup-qt /opt/Qt/${QT_VERSION}/gcc_64/bin/qmake qt-clang_64 && \
- qbs config profiles.qt-clang_64.baseProfile clang && \
- qbs config defaultProfile qt-gcc_64
-
-# Switch back to root user for the entrypoint script.
-USER root
-
-# Work-around for QTBUG-79020
-RUN echo "export QT_NO_GLIB=1" >> /etc/profile.d/qt.sh
diff --git a/docker/focal/entrypoint.sh b/docker/focal/entrypoint.sh
deleted file mode 100755
index 40bc5acb9..000000000
--- a/docker/focal/entrypoint.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-#############################################################################
-##
-## Copyright (C) 2019 Richard Weickelt <richard@weickelt.de>
-## Contact: https://www.qt.io/licensing/
-##
-## This file is part of Qbs.
-##
-## $QT_BEGIN_LICENSE:LGPL$
-## Commercial License Usage
-## Licensees holding valid commercial Qt licenses may use this file in
-## accordance with the commercial license agreement provided with the
-## Software or, alternatively, in accordance with the terms contained in
-## a written agreement between you and The Qt Company. For licensing terms
-## and conditions see https://www.qt.io/terms-conditions. For further
-## information use the contact form at https://www.qt.io/contact-us.
-##
-## GNU Lesser General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU Lesser
-## General Public License version 3 as published by the Free Software
-## Foundation and appearing in the file LICENSE.LGPL3 included in the
-## packaging of this file. Please review the following information to
-## ensure the GNU Lesser General Public License version 3 requirements
-## will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-##
-## GNU General Public License Usage
-## Alternatively, this file may be used under the terms of the GNU
-## General Public License version 2.0 or (at your option) the GNU General
-## Public license version 3 or any later version approved by the KDE Free
-## Qt Foundation. The licenses are as published by the Free Software
-## Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-## included in the packaging of this file. Please review the following
-## information to ensure the GNU General Public License requirements will
-## be met: https://www.gnu.org/licenses/gpl-2.0.html and
-## https://www.gnu.org/licenses/gpl-3.0.html.
-##
-## $QT_END_LICENSE$
-##
-#############################################################################
-
-#
-# Entrypoint script when starting the container. The script checks the current
-# working directory and changes the uid/gid of developer/users to match whatever
-# is found in the working directory. This is useful to match the user and group
-# of mounted volumes into the container
-
-#
-# If not root, re-run script as root to fix ids
-#
-if [ "$(id -u)" != "0" ]; then
- exec gosu root /sbin/entrypoint.sh "$@"
-fi
-
-#
-# Try to determine the uid of the working directory and adjust the current
-# user's uid/gid accordingly.
-#
-USER_GID=${USER_GID:-$(stat -c "%g" .)}
-USER_UID=${USER_UID:-$(stat -c "%u" .)}
-USER_NAME=${USER_NAME:-devel}
-USER_GROUP=${USER_GROUP:-devel}
-EXEC=""
-export HOME=/home/${USER_NAME}
-
-#
-# This is a problem on Linux hosts when we mount a folder from the
-# user file system and write artifacts into that. Thus, we downgrade
-# the current user and make sure that the uid and gid matches the one
-# of the mounted project folder.
-#
-# This work-around is not needed on Windows hosts as Windows doesn't
-# have such a concept.
-#
-if [ "${USER_UID}" != "0" ]; then
- if [ "$(id -u ${USER_NAME})" != "${USER_UID}" ]; then
- usermod -o -u ${USER_UID} ${USER_NAME}
- # After changing the user's uid, all files in user's home directory
- # automatically get the new uid.
- fi
- current_gid=$(id -g ${USER_NAME})
- if [ "$(id -g ${USER_NAME})" != "${USER_GID}" ]; then
- groupmod -o -g ${USER_GID} ${USER_GROUP}
- # Set the new gid on all files in the home directory that still have the
- # old gid.
- find /home/${USER_NAME} -gid "${current_gid}" ! -type l -exec chgrp ${USER_GID} {} \;
- fi
-fi
-EXEC="exec gosu ${USER_NAME}:${USER_GROUP}"
-
-if [ -z "$1" ]; then
- ${EXEC} bash -l
-else
- ${EXEC} bash -l -c "$*"
-fi