Updated build instructions to build arch specific debs

Author: Elixir-Deploy-Bot

Dockerfile-cartridge-debian

@@ -10,6 +10,7 @@ LABEL maintainer="Tim Dudgeon<[email protected]>"
 ENV PG_MAJOR=15
 ENV BOOST_VER=1.81.0
 ARG DOCKER_TAG=latest
+ARG TARGETARCH
 
 RUN apt-get update &&\
  apt-get upgrade -y &&\ 
@@ -37,9 +38,9 @@ RUN apt-get update &&\
  apt-get clean -y
 
 COPY\
-  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime.deb\
-  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Python.deb\
-  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-PgSQL.deb\
+  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime_${TARGETARCH}.deb\
+  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Python_${TARGETARCH}.deb\
+  artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-PgSQL_${TARGETARCH}.deb\
   /tmp/
 RUN dpkg -i /tmp/*.deb && rm -f /tmp/*.deb
 

Dockerfile-java-debian

@@ -27,7 +27,7 @@ RUN apt-get update &&\
 ARG DOCKER_TAG=latest
 
 COPY artifacts/debian/$DOCKER_TAG/java/* /rdkit/gmwrapper/
-COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime.deb /tmp/
+COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime_${TARGETARCH}.deb /tmp/
 RUN dpkg -i /tmp/*.deb && rm -f /tmp/*.deb
 WORKDIR /
 

Dockerfile-python3-debian

@@ -5,6 +5,7 @@ FROM debian:bookworm
 LABEL maintainer="Tim Dudgeon<[email protected]>"
 
 ARG BOOST_VER=1.81.0
+ARG TARGETARCH
 
 RUN apt-get update &&\
  apt-get upgrade -y &&\ 
@@ -35,7 +36,7 @@ RUN apt-get update &&\
 
 ARG DOCKER_TAG=latest
 
-COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime.deb artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Python.deb /tmp/
+COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime_${TARGETARCH}.deb artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Python_${TARGETARCH}.deb /tmp/
 RUN dpkg -i /tmp/*.deb && rm -f /tmp/*.deb
 
 ENV RDBASE=/usr/share/RDKit

Dockerfile-tomcat-debian

@@ -4,6 +4,8 @@
 FROM informaticsmatters/tomcat:8.5-jre11
 LABEL maintainer="Tim Dudgeon<[email protected]>"
 
+ARG TARGETARCH
+
 USER root
 
 RUN apt-get update &&\
@@ -24,7 +26,7 @@ RUN apt-get update &&\
 ARG DOCKER_TAG=latest
 
 COPY artifacts/debian/$DOCKER_TAG/java/* /rdkit/gmwrapper/
-COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime.deb /tmp/
+COPY artifacts/debian/$DOCKER_TAG/debs/RDKit-*-Linux-Runtime_${TARGETARCH}.deb /tmp/
 RUN dpkg -i /tmp/*.deb && rm -f /tmp/*.deb
 
 USER 501

build-debian.sh

@@ -8,7 +8,8 @@ source params.sh
 
 # build RDKit
 docker buildx build $DBO -f Dockerfile-build-debian \
-  --platform linux/arm64,linux/amd64 --push \
+  --platform linux/arm64,linux/amd64 \
+  --push \
   -t $BASE/rdkit-build-debian:$DOCKER_TAG \
   --build-arg GIT_REPO=$GIT_REPO\
   --build-arg GIT_BRANCH=$GIT_BRANCH\
@@ -26,28 +27,32 @@ docker run -it --rm -u $(id -u)\
 
 # build image for python3 on debian
 docker buildx build $DBO -f Dockerfile-python3-debian \
- --platform linux/arm64,linux/amd64 --push \
+ --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 \
+ --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 \
+ --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 \
-  --platform linux/arm64,linux/amd64 --push \
+  --platform linux/arm64,linux/amd64 \
+  --push \
   -t $BASE/rdkit-cartridge-debian:$DOCKER_TAG \
   --build-arg DOCKER_TAG=$DOCKER_TAG .
 echo "Built image ${BASE}/rdkit-cartridge-debian:$DOCKER_TAG"