From 1f70add10fa53d12202a629fe42e40d4d14ea0d0 Mon Sep 17 00:00:00 2001
From: odelaere <odelaere@users.noreply.github.com>
Date: Tue, 17 May 2022 10:59:40 +0200
Subject: [PATCH] fix Dockerfile-demo

---
 docker/Dockerfile-demo | 63 ++++++++++++++++++++----------------------
 1 file changed, 30 insertions(+), 33 deletions(-)

diff --git a/docker/Dockerfile-demo b/docker/Dockerfile-demo
index 45806f1..af45ef1 100644
--- a/docker/Dockerfile-demo
+++ b/docker/Dockerfile-demo
@@ -8,9 +8,8 @@ COPY --chown=imio *.cfg *.conf requirements.txt Makefile /plone/
 RUN apt-get update \
   && apt-get full-upgrade -qqy \
   && apt-get install -qqy --no-install-recommends \
-     python-is-python2 \
      lynx \
-     openjdk-16-jre-headless \
+     openjdk-18-jre-headless \
      libreoffice \
      libreoffice-script-provider-python \
      file \
@@ -18,45 +17,43 @@ RUN apt-get update \
      graphicsmagick \
      ghostscript \
      poppler-data \
-     poppler-utils \
      ruby \
      libmagic1 \
-     libjpeg62 \
-     libpng16-16 \
-     libopenjp2-7 \
-     libldap-2.4-2 \
+     libldap-2.5-0 \
      ldap-utils \
-     libwebp6 \
-     libgif7 \
      libpq5 \
      lbzip2 \
-     librsvg2-bin\
      libsigc++-2.0-0v5 \
   && apt-get purge -qqy libreoffice-gnome libreoffice-gtk* libreoffice-help* libreoffice-kde* \
   && buildDeps="build-essential \
-                python-dev-is-python2 \
-                cmake \
-                make \
-                wget \
-                python3-pip \
-                libpq-dev \
-                libreadline-dev \
-                gcc \
-                libc6-dev \
-                libpcre3-dev \
-                libssl-dev \
-                libxml2-dev \
-                libxslt1-dev \
-                libbz2-dev \
-                libffi-dev \
-                libjpeg62-dev \
-                libopenjp2-7-dev \
-                zlib1g-dev \
-                libldap2-dev \
-                libwebp-dev \
-                libsasl2-dev \
-                libldap2-dev \
-                libsigc++-2.0-dev" \
+        python2-dev \
+        cmake \
+        make \
+        python3-pip \
+        wget \
+        git \
+        gcc \
+        libpq-dev \
+        libreadline-dev \
+        libc6-dev \
+        libpcre3-dev \
+        libssl-dev \
+        libssl-dev \
+        libxml2-dev \
+        libxslt1-dev \
+        libbz2-dev \
+        zlib1g-dev \
+        libldap2-dev \
+        libsasl2-dev \
+        libldap2-dev \
+        libsigc++-2.0-dev \
+        libffi-dev \
+        libjpeg62-dev \
+        libopenjp2-7-dev \
+        libwebp-dev \
+        libgif-dev \
+        zlib1g-dev \
+        libwebp-dev" \
   && apt-get install -qqy --no-install-recommends $buildDeps \
   && rm -rf /var/lib/apt/lists/* \
   && pip install "virtualenv>=20.7.2" \