From 2470b614b6af949920258ae90883da877d2bdf4e Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Fri, 1 Jan 2021 21:11:05 +0200 Subject: [PATCH 1/3] Add PySide6 to ubuntu-20.04-focal-amd64 --- ubuntu-20.04-focal-amd64/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile index 93ee41e1..504f9766 100644 --- a/ubuntu-20.04-focal-amd64/Dockerfile +++ b/ubuntu-20.04-focal-amd64/Dockerfile @@ -4,16 +4,20 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ cmake \ ghostscript \ git \ + libegl-dev \ libffi-dev \ libfreetype6-dev \ libfribidi-dev \ + libgl-dev \ libharfbuzz-dev \ libjpeg-turbo-progs \ libjpeg8-dev \ liblcms2-dev \ + libopengl-dev \ libopenjp2-7-dev \ libtiff5-dev \ libwebp-dev \ + libxkbcommon-dev \ netpbm \ python3-dev \ python3-numpy \ @@ -36,7 +40,7 @@ RUN useradd pillow \ RUN virtualenv -p /usr/bin/python3.8 --system-site-packages /vpy3 \ && /vpy3/bin/pip install --no-cache-dir --upgrade pip \ - && /vpy3/bin/pip install --no-cache-dir cffi olefile pytest pytest-cov \ + && /vpy3/bin/pip install --no-cache-dir cffi olefile pyside6 pytest pytest-cov \ && chown -R pillow:pillow /vpy3 ADD depends /depends From e57eb19432385bb9180712e277dd39170a56585a Mon Sep 17 00:00:00 2001 From: Hugo van Kemenade Date: Sun, 3 Jan 2021 15:09:31 +0200 Subject: [PATCH 2/3] Add more libs for Qt --- ubuntu-20.04-focal-amd64/Dockerfile | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile index 504f9766..56719c75 100644 --- a/ubuntu-20.04-focal-amd64/Dockerfile +++ b/ubuntu-20.04-focal-amd64/Dockerfile @@ -17,7 +17,12 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ libopenjp2-7-dev \ libtiff5-dev \ libwebp-dev \ + libxcb-icccm4 \ + libxcb-image0 \ + libxcb-keysyms1 \ + libxcb-render-util0 \ libxkbcommon-dev \ + libxkbcommon-x11-0 \ netpbm \ python3-dev \ python3-numpy \ From 0f9c94facf011c6d9db8f221271ba5cdd3a35d10 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Mon, 4 Jan 2021 21:31:30 +1100 Subject: [PATCH 3/3] Removed unnecessary libraries --- ubuntu-20.04-focal-amd64/Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/ubuntu-20.04-focal-amd64/Dockerfile b/ubuntu-20.04-focal-amd64/Dockerfile index 56719c75..a6aefee4 100644 --- a/ubuntu-20.04-focal-amd64/Dockerfile +++ b/ubuntu-20.04-focal-amd64/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ libffi-dev \ libfreetype6-dev \ libfribidi-dev \ - libgl-dev \ libharfbuzz-dev \ libjpeg-turbo-progs \ libjpeg8-dev \ @@ -21,7 +20,6 @@ RUN apt-get -qq update && DEBIAN_FRONTEND=noninteractive apt-get -y install \ libxcb-image0 \ libxcb-keysyms1 \ libxcb-render-util0 \ - libxkbcommon-dev \ libxkbcommon-x11-0 \ netpbm \ python3-dev \