Skip to content

Commit

Permalink
chore: Use Ubuntu 20.04 (focal), move to Qt 5.15.2, dependency updates (
Browse files Browse the repository at this point in the history
#16)

* Use Ubuntu 20.04 (focal), Qt 5.15.2 add extra qt dependencies for linuxdeploy

* Use Ubuntu 20.04 (focal), Qt 5.15.2 add extra qt dependencies for linuxdeploy

* Update dfu-util libusb and openssl dependencies

* Add back gstreamer deleted in error

* Change openssl root directory hint to libssl1
  • Loading branch information
Neil Horne authored Nov 10, 2023
1 parent a2c5c37 commit 91a9e4f
Showing 1 changed file with 14 additions and 5 deletions.
19 changes: 14 additions & 5 deletions dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG OS_CODENAME=bionic
ARG OS_CODENAME=focal

FROM ubuntu:${OS_CODENAME}

Expand All @@ -20,16 +20,21 @@ RUN apt-get update && \
build-essential \
dumb-init \
libfox-1.6-dev python3-clang-10 \
libsdl1.2-dev libsdl2-dev \
libsdl2-dev \
cmake \
git \
zip \
unzip \
file \
python3-pip \
gawk \
# Install some dependencies required by Qt libs
libxkbcommon-x11-0 gstreamer1.0-plugins-base && \
# Install dfu-util and libusb
dfu-util \
# Install dependencies required by Qt libs
libssl-dev \
gstreamer1.0-plugins-base \
# linuxdeploy-plugin-qt requires libxcb1 and supporting libs
awesome && \
rm -rf /var/lib/apt/lists/*

RUN python3 -m pip install -U pip setuptools \
Expand All @@ -44,7 +49,7 @@ RUN python3 -m pip install -U pip setuptools \
# see https://github.com/miurahr/aqtinstall/
# see https://github.com/vslotman/docker-aqtinstall

ARG QT_VERSION=5.12.9
ARG QT_VERSION=5.15.2
# if modules use syntax -m MODULE [MODULE]
ARG QT_MODULES=
# supported versions of dependencies
Expand Down Expand Up @@ -76,4 +81,8 @@ VOLUME ["/src"]

ENV ASAN_OPTIONS="detect_leaks=0"

# HINTS for cmake find_package
ENV LIBUSB1_ROOT_DIR=/usr/lib/x86_64-linux-gnu
ENV LIBSSL1_ROOT_DIR=/usr/lib/x86_64-linux-gnu

ENTRYPOINT ["/usr/bin/dumb-init", "--"]

0 comments on commit 91a9e4f

Please sign in to comment.