switched to debian:bullseye, removed postgres patch

Author: tdudgeon

Dockerfile-build-debian

@@ -3,13 +3,15 @@
 # It's purpose is to create the RDKit artifacts that will be deployed to lighter weight images.
 
 # Latest RDKit now needs cmake 3.1 which is not preset on jessie so we must use buster
-FROM debian:buster
+FROM debian:bullseye
 LABEL maintainer="Tim Dudgeon<[email protected]>"
 
 ARG GIT_REPO
 ARG GIT_BRANCH=master
 ARG GIT_TAG
-ARG POSTGRES_VERSION=11
+ARG POSTGRES_VERSION=13
+
+RUN echo "deb http://deb.debian.org/debian buster main" >> /etc/apt/sources.list
 
 RUN apt-get update &&\
   apt-get install -y --no-install-recommends \
@@ -21,14 +23,14 @@ RUN apt-get update &&\
   sqlite3\
   libsqlite3-dev\
   libboost-dev\
-  libboost-system1.67-dev\
-  libboost-thread1.67-dev\
-  libboost-serialization1.67-dev\
-  libboost-python1.67-dev\
-  libboost-regex1.67-dev\
-  libboost-iostreams1.67-dev\
+  libboost-system1.74-dev\
+  libboost-thread1.74-dev\
+  libboost-serialization1.74-dev\
+  libboost-python1.74-dev\
+  libboost-regex1.74-dev\
+  libboost-iostreams1.74-dev\
   zlib1g-dev\
-  swig\
+  swig3.0\
   libeigen3-dev\
   git\
   wget\
@@ -46,10 +48,6 @@ RUN if [ $GIT_TAG ]; then echo "Checking out tag $GIT_TAG from repo $GIT_REPO br
 RUN git clone -b $GIT_BRANCH --single-branch $GIT_REPO &&\
   if [ $GIT_TAG ]; then cd rdkit && git fetch --tags && git checkout $GIT_TAG; fi
 
-# hack to build cartridge packages. can be removed once this code hits the repo
-COPY patch_pgsql_rpm.patch /rdkit
-RUN cd /rdkit && patch -p1 < patch_pgsql_rpm.patch
-
 ENV RDBASE=/rdkit
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RDBASE/lib:$RDBASE/Code/JavaWrappers/gmwrapper:/usr/lib/x86_64-linux-gnu
 ENV PYTHONPATH=$PYTHONPATH:$RDBASE

Dockerfile-java-debian

@@ -1,22 +1,22 @@
 # Dockerfile for Java based RDKit implementation
 # Based on Debian.
 
-FROM debian:buster
+FROM debian:bullseye
 LABEL maintainer="Tim Dudgeon<[email protected]>"
 
 
 RUN apt-get update &&\
  apt-get upgrade -y &&\
  apt-get install -y --no-install-recommends\
  openjdk-11-jre-headless\
- libboost-system1.67.0\
- libboost-thread1.67.0\
- libboost-serialization1.67.0\
- libboost-regex1.67.0\
- libboost-chrono1.67.0\
- libboost-date-time1.67.0\
- libboost-atomic1.67.0\
- libboost-iostreams1.67.0\
+ libboost-system1.74.0\
+ libboost-thread1.74.0\
+ libboost-serialization1.74.0\
+ libboost-regex1.74.0\
+ libboost-chrono1.74.0\
+ libboost-date-time1.74.0\
+ libboost-atomic1.74.0\
+ libboost-iostreams1.74.0\
  libfreetype6 &&\
  apt-get clean -y
 

Dockerfile-tomcat-debian

@@ -10,14 +10,14 @@ RUN apt-get update &&\
  apt-get upgrade -y &&\ 
  apt-get install -y --no-install-recommends\
  unzip\
- libboost-system1.67.0\
- libboost-thread1.67.0\
- libboost-serialization1.67.0\
- libboost-regex1.67.0\
- libboost-chrono1.67.0\
- libboost-date-time1.67.0\
- libboost-atomic1.67.0\
- libboost-iostreams1.67.0\
+ libboost-system1.74.0\
+ libboost-thread1.74.0\
+ libboost-serialization1.74.0\
+ libboost-regex1.74.0\
+ libboost-chrono1.74.0\
+ libboost-date-time1.74.0\
+ libboost-atomic1.74.0\
+ libboost-iostreams1.74.0\
  libfreetype6-dev &&\
  apt-get clean -y