qt6: some CI & docker tuning
This commit is contained in:
1 parent
3f20408b75
commit
9323db291d
4 files changed
+13
-3
No files matched your search
@@ -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
|
||||
|
||||
@@ -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/
|
||||
|
||||
|
||||
@@ -1 +1,2 @@
|
||||
DOCKER_IMAGE=pm3-debian-trixie:1.0
|
||||
SKIPQT=1
|
||||
Reference in new issue
Block a user