diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 261cb693c..bb94775bb 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -30,7 +30,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev + run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev - name: Install Python dependencies run: pip install -r tools/requirements.txt @@ -60,7 +60,7 @@ jobs: run: sudo apt-get update - name: Install dependencies - run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev + run: sudo apt-get install -yqq make autoconf build-essential ca-certificates pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev qt6-base-dev qmake6-bin libbz2-dev liblz4-dev libbluetooth-dev libpython3-dev python3 python3-dev libpython3-all-dev liblua5.4-dev liblua5.4-0 lua5.4 sed libssl-dev libgd-dev - name: Install Python dependencies run: pip install -r tools/requirements.txt diff --git a/docker/build.sh b/docker/build.sh index 499100942..9fd6e4bac 100755 --- a/docker/build.sh +++ b/docker/build.sh @@ -14,6 +14,10 @@ else BUILDARG="" fi +if [ -n "$SKIPQT" ]; then + BUILDARG="$BUILDARG --build-arg SKIPQT=$SKIPQT" +fi + # For cross-platform support: # cf https://github.com/multiarch/qemu-user-static #sudo apt install qemu-user-static diff --git a/docker/debian-13-trixie/Dockerfile b/docker/debian-13-trixie/Dockerfile index 38513db23..5047c6679 100644 --- a/docker/debian-13-trixie/Dockerfile +++ b/docker/debian-13-trixie/Dockerfile @@ -2,7 +2,6 @@ FROM debian:trixie-slim ENV LANG=C ENV DEBIAN_FRONTEND=noninteractive -# qtbase5-dev skipped RUN apt-get update && \ apt-get upgrade -y && \ apt-get dist-upgrade -y && \ @@ -12,6 +11,12 @@ RUN apt-get update && \ RUN apt-get install -y opencl-dev && \ apt-get clean +ARG SKIPQT=false +RUN if [ "${SKIPQT}" = "false" ]; then \ + apt-get install -y qt6-base-dev qmake6-bin && \ + apt-get clean; \ + fi + # uv COPY --from=ghcr.io/astral-sh/uv:latest /uv /uvx /bin/ diff --git a/docker/debian-13-trixie/docker_conf.inc b/docker/debian-13-trixie/docker_conf.inc index 481a94e9f..5e7d4dc09 100644 --- a/docker/debian-13-trixie/docker_conf.inc +++ b/docker/debian-13-trixie/docker_conf.inc @@ -1 +1,2 @@ DOCKER_IMAGE=pm3-debian-trixie:1.0 +SKIPQT=1