Updates to get arm64 and amd64 builds working in parallel

Author: Elixir-Deploy-Bot

Dockerfile-build-debian

@@ -10,7 +10,7 @@ ARG GIT_BRANCH=master
 ARG GIT_TAG
 ARG TARGETARCH
 ARG POSTGRES_VERSION=15
-ARG BOOST_VER=1.81-dev
+ARG BOOST_VER=1.81
 
 RUN apt-get update &&\
   apt-get install -y --no-install-recommends \
@@ -22,6 +22,7 @@ RUN apt-get update &&\
   sqlite3\
   libsqlite3-dev\
   libboost$BOOST_VER\
+  libboost$BOOST_VER-dev\
   libboost-system$BOOST_VER\
   libboost-thread$BOOST_VER\
   libboost-serialization$BOOST_VER\

Dockerfile-java-debian

@@ -5,7 +5,7 @@ FROM debian:bookworm
 LABEL maintainer="Tim Dudgeon<[email protected]>"
 
 ARG TARGETARCH
-ARG BOOST_VER=1.81.0
+ARG BOOST_VER=1.74.0
 
 RUN apt-get update &&\
  apt-get upgrade -y &&\

build-centos.sh

@@ -12,8 +12,11 @@ source params.sh
 
 # build RDKit
 docker build --no-cache -f Dockerfile-build-centos\
+  --platform $ARCH --push \
   -t $BASE/rdkit-build-centos:$DOCKER_TAG\
-  --build-arg RDKIT_BRANCH=$GIT_BRANCH .
+  --build-arg GIT_REPO=$GIT_REPO\
+  --build-arg GIT_BRANCH=$GIT_BRANCH\
+  --build-arg GIT_TAG=$GIT_TAG .
 
 # copy the packages
 rm -rf artifacts/centos/$DOCKER_TAG
@@ -26,14 +29,14 @@ docker run -it --rm -u $(id -u)\
 
 # build image for python
 docker build --no-cache -f Dockerfile-python3-centos\
+  --platform $ARCH --push \
   -t $BASE/rdkit-python3-centos:$DOCKER_TAG\
   --build-arg TAG=$DOCKER_TAG .
 echo "Built image ${BASE}/rdkit-python3-centos:$DOCKER_TAG"
 
 # build image for java
 docker build --no-cache -f Dockerfile-java-centos\
+  --platform $ARCH --push \
   -t $BASE/rdkit-java-centos:$DOCKER_TAG\
   --build-arg TAG=$DOCKER_TAG .
 echo "Built image ${BASE}/rdkit-java-centos:$DOCKER_TAG"
-
-

build-debian.sh

@@ -24,25 +24,25 @@ docker run -it --rm -u $(id -u)\
   $BASE/rdkit-build-debian:$DOCKER_TAG bash -c 'cp /rdkit/build/*.deb /tohere/debs && cp /rdkit/Code/JavaWrappers/gmwrapper/org.RDKit.jar /rdkit/Code/JavaWrappers/gmwrapper/libGraphMolWrap.so /rdkit/Code/JavaWrappers/gmwrapper/javadoc.tgz /tohere/java'
 
 # build image for python3 on debian
-#docker buildx build $DBO -f Dockerfile-python3-debian \
-#  --platform linux/arm64,linux/amd64 --push \
-#  -t $BASE/rdkit-python3-debian:$DOCKER_TAG \
-#  --build-arg DOCKER_TAG=$DOCKER_TAG .
-#echo "Built image ${BASE}/rdkit-python3-debian:$DOCKER_TAG"
-#
-## build image for java on debian
-#docker buildx build $DBO -f Dockerfile-java-debian \
-#  --platform linux/arm64,linux/amd64 --push \
-#  -t $BASE/rdkit-java-debian:$DOCKER_TAG \
-#  --build-arg DOCKER_TAG=$DOCKER_TAG .
-#echo "Built image ${BASE}/rdkit-java-debian:$DOCKER_TAG"
-#
-## build image for tomcat on debian
-#docker buildx build $DBO -f Dockerfile-tomcat-debian \
-#  --platform linux/amd64 --push \
-#  -t $BASE/rdkit-tomcat-debian:$DOCKER_TAG \
-#  --build-arg DOCKER_TAG=$DOCKER_TAG .
-#echo "Built image ${BASE}/rdkit-tomcat-debian:$DOCKER_TAG"
+docker buildx build $DBO -f Dockerfile-python3-debian \
+ --platform linux/arm64,linux/amd64 --push \
+ -t $BASE/rdkit-python3-debian:$DOCKER_TAG \
+ --build-arg DOCKER_TAG=$DOCKER_TAG .
+echo "Built image ${BASE}/rdkit-python3-debian:$DOCKER_TAG"
+
+build image for java on debian
+docker buildx build $DBO -f Dockerfile-java-debian \
+ --platform linux/arm64,linux/amd64 --push \
+ -t $BASE/rdkit-java-debian:$DOCKER_TAG \
+ --build-arg DOCKER_TAG=$DOCKER_TAG .
+echo "Built image ${BASE}/rdkit-java-debian:$DOCKER_TAG"
+
+# build image for tomcat on debian
+docker buildx build $DBO -f Dockerfile-tomcat-debian \
+ --platform linux/arm64,linux/amd64 --push \
+ -t $BASE/rdkit-tomcat-debian:$DOCKER_TAG \
+ --build-arg DOCKER_TAG=$DOCKER_TAG .
+echo "Built image ${BASE}/rdkit-tomcat-debian:$DOCKER_TAG"
 
 # build image for postgresql cartridge on debian
 docker buildx build $DBO -f Dockerfile-cartridge-debian \

params.sh

@@ -1,6 +1,6 @@
 export DOCKER_TAG=Release_2020_03
 export GIT_REPO=https://github.com/rdkit/rdkit.git
-export GIT_BRANCH=Release_2020_03
+export GIT_BRANCH=Release_2023_03
 unset GIT_TAG
 
 export BASE=nmunro