chore: remove libfox and match builder with dev (#33)

Co-authored-by: Raphael <[email protected]>
Co-authored-by: Peter Feerick <[email protected]>

Author: raphaelcoeffic

builder/Dockerfile

@@ -3,42 +3,48 @@ ARG OS_CODENAME=jammy
 FROM ubuntu:${OS_CODENAME}
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG GCC_ARM_VERSION=14.2.rel1
 
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
+        ca-certificates \
         build-essential \
         dumb-init \
-        python3-clang \
+        libclang-dev \
         cmake \
         git \
         zip \
         unzip \
         file \
         wget \
-        python3-pip \
+        python3-dev \
         gawk && \
-    rm -rf /var/lib/apt/lists/*
-
-RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz -O - \
+    apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Python packages installation
+COPY --from=ghcr.io/astral-sh/uv:0.8.2 /uv /uvx /bin/
+ENV VIRTUAL_ENV=/opt/venv
+RUN uv venv \
+        --python-preference system --no-python-downloads \
+        ${VIRTUAL_ENV} && \
+    uv pip install --no-cache \
+        asciitree \
+        clang \
+        jinja2 \
+        pillow \
+        lz4 \
+        pyelftools \
+        pydantic
+# Add venv to PATH
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+# Install ARM toolchain
+RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz -O - \
         | tar -xJ -C /opt
 
-RUN python3 -m pip install -U pip setuptools \
-    && python3 -m pip install \
-    asciitree \
-    jinja2 \
-    pillow \
-    lz4 \
-    pyelftools \
-    pydantic
-
-# work-around for datacopy build script in 2.8.5
-RUN ln -s /usr/lib/x86_64-linux-gnu/libclang-14.so.14.0.0 /usr/lib/libclang-14.so && \
-    ln -s /usr/lib/x86_64-linux-gnu/libclang-14.so.14.0.0 /usr/lib/libclang.so
-
-ENV PATH=/opt/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi/bin/:${PATH}
+ENV PATH=/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin/:${PATH}
 
 VOLUME ["/src"]
-
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]
 
 RUN useradd --create-home --shell /bin/bash rootless

dev/Dockerfile

@@ -35,7 +35,6 @@ RUN apt-get update && \
         build-essential \
         dumb-init \
         libclang-dev \
-        libfox-1.6-dev \
         cmake \
         kitware-archive-keyring \
         git \
@@ -68,7 +67,7 @@ RUN apt-get update && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # Python packages installation
-COPY --from=ghcr.io/astral-sh/uv:0.7.20 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.8.2 /uv /uvx /bin/
 ENV VIRTUAL_ENV=/opt/venv
 RUN uv venv \
         --python-preference system --no-python-downloads \
@@ -77,8 +76,7 @@ RUN uv venv \
         asciitree \
         clang \
         jinja2 \
-        pillow==7.2.0 \
-        aqtinstall \
+        pillow \
         lz4 \
         pyelftools \
         pydantic
@@ -96,7 +94,7 @@ ENV QML2_IMPORT_PATH=${QT_BASE_DIR}/qml/
 ENV LD_LIBRARY_PATH=${QT_BASE_DIR}/lib:$LD_LIBRARY_PATH
 ENV PKG_CONFIG_PATH=${QT_BASE_DIR}/lib/pkgconfig:$PKG_CONFIG_PATH
 
-RUN aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES} && \
+RUN uvx --no-cache --from aqtinstall aqt install-qt --outputdir ${QT_INSTALL_DIR} ${QT_HOST} ${QT_TARGET} ${QT_VERSION} ${QT_ARCH} ${QT_MODULES} && \
     strip --remove-section=.note.ABI-tag ${QT_BASE_DIR}/lib/libQt5Core.so.${QT_VERSION}
 
 # Install ARM toolchain

gitpod/Dockerfile

@@ -1,39 +1,49 @@
 FROM gitpod/workspace-base:latest
 
 ARG DEBIAN_FRONTEND=noninteractive
+ARG GCC_ARM_VERSION=14.2.rel1
 
 USER root
 
 RUN apt-get update && \
     apt-get install --yes --no-install-recommends \
+        ca-certificates \
         build-essential \
         dumb-init \
-        python3-clang \
+        libclang-dev \
         cmake \
         git \
         zip \
         unzip \
         file \
-        python3-pip \
+        wget \
+        python3-dev \
         gawk && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz -O - \
+RUN wget --quiet https://developer.arm.com/-/media/Files/downloads/gnu/${GCC_ARM_VERSION}/binrel/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi.tar.xz -O - \
         | tar -xJ -C /opt
+ENV PATH=/opt/arm-gnu-toolchain-${GCC_ARM_VERSION}-x86_64-arm-none-eabi/bin/:${PATH}
+
+# Python packages installation
+COPY --from=ghcr.io/astral-sh/uv:0.8.2 /uv /uvx /bin/
+ENV VIRTUAL_ENV=/opt/venv
+RUN uv venv \
+        --python-preference system --no-python-downloads \
+        ${VIRTUAL_ENV} && \
+    uv pip install --no-cache \
+        asciitree \
+        clang \
+        jinja2 \
+        pillow \
+        lz4 \
+        pyelftools \
+        pydantic
+# Add venv to PATH
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 USER gitpod
 
-RUN python3 -m pip install -U pip setuptools \
-    && python3 -m pip install \
-    asciitree \
-    jinja2 \
-    pillow \
-    lz4 \
-    pyelftools \
-    pydantic
-
-ENV PATH=/opt/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi/bin/:${PATH}
-
 VOLUME ["/src"]
 
 ENTRYPOINT ["/usr/bin/dumb-init", "--"]