Skip to content

Commit 90f0f8d

Browse files
Switched params to be latest/master and added a means to build arch specific deb files
1 parent 34a52d8 commit 90f0f8d

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@
33
.idea
44
docker-rdkit.iml
55
artifacts/
6+
.DS_Store

Dockerfile-build-debian

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ ARG GIT_TAG
1111
ARG TARGETARCH
1212
ARG POSTGRES_VERSION=15
1313
ARG BOOST_VER=1.81
14+
ARG DEB_PACKAGE_DETAILS
15+
ARG DEB_PACKAGE_NAME=RDKit-${DEB_PACKAGE_DETAILS}-Linux-Python_${TARGETARCH}.deb
1416

1517
RUN apt-get update &&\
1618
apt-get install -y --no-install-recommends \
@@ -75,7 +77,7 @@ RUN nproc=$(getconf _NPROCESSORS_ONLN)\
7577
&& make -j $(( nproc > 2 ? nproc - 2 : 1 ))
7678
RUN make install
7779
RUN sh Code/PgSQL/rdkit/pgsql_install.sh
78-
RUN cpack -G DEB
80+
RUN cpack -D CPACK_DEBIAN_FILE_NAME=${DEB_PACKAGE_NAME} -G DEB
7981
RUN cd /rdkit/Code/JavaWrappers/gmwrapper && tar cvfz javadoc.tgz doc
8082

8183
WORKDIR $RDBASE

build-debian.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ docker buildx build $DBO -f Dockerfile-build-debian \
1212
-t $BASE/rdkit-build-debian:$DOCKER_TAG \
1313
--build-arg GIT_REPO=$GIT_REPO\
1414
--build-arg GIT_BRANCH=$GIT_BRANCH\
15+
--build-arg DEB_PACKAGE_DETAILS=$(echo $GIT_BRANCH | cut -d_ -f2 -f3)\
1516
--build-arg GIT_TAG=$GIT_TAG .
1617

1718
# copy the packages

params.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
export DOCKER_TAG=Release_2023_03
1+
export DOCKER_TAG=latest
22
export GIT_REPO=https://github.com/rdkit/rdkit.git
3-
export GIT_BRANCH=Release_2023_03
3+
export GIT_BRANCH=master
44
unset GIT_TAG
55

66
export BASE=nmunro

0 commit comments

Comments
 (0)