Skip to content

Commit 13fdfce

Browse files
tdudgeonElixir-Deploy-Bot
authored andcommitted
debian bookworm
1 parent d1df5b2 commit 13fdfce

File tree

5 files changed

+18
-15
lines changed

5 files changed

+18
-15
lines changed

Dockerfile-build-debian

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
# This is a heavyweight image containing all aspects of RDKit plus the build system.
33
# It's purpose is to create the RDKit artifacts that will be deployed to lighter weight images.
44

5-
FROM debian:bullseye
5+
FROM debian:bookworm
66
LABEL maintainer="Tim Dudgeon<[email protected]>"
77

88
ARG GIT_REPO
99
ARG GIT_BRANCH=master
1010
ARG GIT_TAG
11-
ARG POSTGRES_VERSION=13
1211
ARG TARGETARCH
13-
ARG BOOST_VER=1.74-dev
12+
ARG POSTGRES_VERSION=15
13+
ARG BOOST_VER=1.81-dev
1414

1515
RUN apt-get update &&\
1616
apt-get install -y --no-install-recommends \
@@ -21,7 +21,7 @@ RUN apt-get update &&\
2121
cmake\
2222
sqlite3\
2323
libsqlite3-dev\
24-
libboost-dev\
24+
libboost$BOOST_VER\
2525
libboost-system$BOOST_VER\
2626
libboost-thread$BOOST_VER\
2727
libboost-serialization$BOOST_VER\
@@ -33,7 +33,7 @@ RUN apt-get update &&\
3333
libeigen3-dev\
3434
git\
3535
wget\
36-
openjdk-11-jdk\
36+
openjdk-17-jdk\
3737
postgresql-$POSTGRES_VERSION\
3838
postgresql-server-dev-$POSTGRES_VERSION\
3939
postgresql-plpython3-$POSTGRES_VERSION\
@@ -50,7 +50,7 @@ RUN git clone -b $GIT_BRANCH --single-branch $GIT_REPO &&\
5050
ENV RDBASE=/rdkit
5151
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$RDBASE/lib:$RDBASE/Code/JavaWrappers/gmwrapper:/usr/lib/x86_64-linux-gnu:/usr/lib/aarch64-linux-gnu/
5252
ENV PYTHONPATH=$PYTHONPATH:$RDBASE
53-
ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${TARGETARCH}
53+
ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-${TARGETARCH}
5454
ENV CLASSPATH=$RDBASE/Code/JavaWrappers/gmwrapper/org.RDKit.jar
5555

5656
RUN mkdir $RDBASE/build

Dockerfile-cartridge-debian

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
# build the deb packages so we need to install the packages using apt to have tight control over this.
55
#
66

7-
FROM debian:bullseye
7+
FROM debian:bookworm
88
LABEL maintainer="Tim Dudgeon<[email protected]>"
99

10-
ENV PG_MAJOR=13
11-
ENV BOOST_VER=1.74.0
10+
ENV PG_MAJOR=15
11+
ENV BOOST_VER=1.81.0
1212
ARG DOCKER_TAG=latest
1313

1414
RUN apt-get update &&\

Dockerfile-java-debian

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Dockerfile for Java based RDKit implementation
22
# Based on Debian.
33

4-
FROM debian:bullseye
4+
FROM debian:bookworm
55
LABEL maintainer="Tim Dudgeon<[email protected]>"
66

77
ARG TARGETARCH
8-
ARG BOOST_VER=1.74.0
8+
ARG BOOST_VER=1.81.0
99

1010
RUN apt-get update &&\
1111
apt-get upgrade -y &&\
1212
apt-get install -y --no-install-recommends\
13-
openjdk-11-jre-headless\
13+
openjdk-17-jre-headless\
1414
libboost-system$BOOST_VER\
1515
libboost-thread$BOOST_VER\
1616
libboost-serialization$BOOST_VER\
@@ -29,7 +29,7 @@ COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime.deb /tmp/
2929
RUN dpkg -i /tmp/*.deb && rm -f /tmp/*.deb
3030
WORKDIR /
3131

32-
ENV JAVA_HOME /usr/lib/jvm/java-11-openjdk-${TARGETARCH}
32+
ENV JAVA_HOME /usr/lib/jvm/java-17-openjdk-${TARGETARCH}
3333
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/rdkit/gmwrapper
3434
ENV CLASSPATH=/rdkit/gmwrapper/org.RDKit.jar
3535
ENV RDBASE=/usr/share/RDKit

Dockerfile-python3-debian

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Dockerfile for Python3 based RDKit implementation
22
# Based on Debian.
33

4-
FROM debian:bullseye
4+
FROM debian:bookworm
55
LABEL maintainer="Tim Dudgeon<[email protected]>"
66

7-
ARG BOOST_VER=1.74.0
7+
ARG BOOST_VER=1.81.0
88

99
RUN apt-get update &&\
1010
apt-get upgrade -y &&\

README.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,9 @@ For each RDKit version (image tag) we build a number of images:
6464
* `Release_2022_09` - build from RDKit Release_2022_09 branch and occasionally rebuilt as the code gets updated. Images have tag of `Release_2022_09`
6565
* `Release_2022_09_4` - build from RDKit Release_2021_09_4 release tag. These images should never change [1]. Images have tag of `Release_2022_09_4`
6666
* `Release_2022_09_5` - build from RDKit Release_2021_09_5 release tag. These images should never change [1]. Images have tag of `Release_2022_09_5`
67+
* `Release_2023_03` - build from RDKit Release_2023_03 branch and occasionally rebuilt as the code gets updated. Images have tag of `Release_2023_03`
68+
* `Release_2023_03_1` - build from RDKit Release_2023_03_1 release tag. These images should never change [1]. Images have tag of `Release_2023_03_1`
69+
* `Release_2023_03_2` - build from RDKit Release_2023_03_2 release tag. These images should never change [1]. Images have tag of `Release_2023_03_2`
6770

6871

6972
[1] Where we say that the images should never change what we really mean in that the RDKit content should never change. We may rebuild these images occasionally when we find further improvements, and the underlying Centos/Debian packages may be updated, but the RDKit code should be exactly the same.

0 commit comments

Comments
 (0)