From 03f06432ab18756172fe650ef87547af3dcfa78a Mon Sep 17 00:00:00 2001 From: Punit Darira Date: Tue, 30 Apr 2024 22:25:14 -0400 Subject: [PATCH 1/3] feat(docker-camunda-bpm-platform): Added sql and postgresql version arguement. related to #2692 --- Dockerfile | 3 +++ download.sh | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8c8f1d01..3d4ed7fd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,6 +13,9 @@ ARG MAVEN_PROXY_PORT ARG MAVEN_PROXY_USER ARG MAVEN_PROXY_PASSWORD +ARG POSTGRESQL_VERSION +ARG MYSQL_VERSION + ARG JMX_PROMETHEUS_VERSION=0.12.0 RUN apk add --no-cache \ diff --git a/download.sh b/download.sh index 812622e5..2d831219 100755 --- a/download.sh +++ b/download.sh @@ -82,8 +82,12 @@ mvn dependency:get -U -B --global-settings /tmp/settings.xml \ -DgroupId="org.camunda.bpm" -DartifactId="camunda-database-settings" \ -Dversion="${ARTIFACT_VERSION}" -Dpackaging="pom" -Dtransitive=false cambpmdbsettings_pom_file=$(find /m2-repository -name "camunda-database-settings-${ARTIFACT_VERSION}.pom" -print | head -n 1) -MYSQL_VERSION=$(xmlstarlet sel -t -v //_:version.mysql $cambpmdbsettings_pom_file) -POSTGRESQL_VERSION=$(xmlstarlet sel -t -v //_:version.postgresql $cambpmdbsettings_pom_file) +if [ -z "$MYSQL_VERSION" ]; then + MYSQL_VERSION=$(xmlstarlet sel -t -v //_:version.mysql $cambpmdbsettings_pom_file) +fi +if [ -z "$POSTGRESQL_VERSION" ]; then + POSTGRESQL_VERSION=$(xmlstarlet sel -t -v //_:version.postgresql $cambpmdbsettings_pom_file) +fi mvn dependency:copy -B \ $PROXY \ From fe0dc3c397912a19a792de43c1feac73c77debaa Mon Sep 17 00:00:00 2001 From: punitdarira Date: Fri, 3 May 2024 18:53:29 -0400 Subject: [PATCH 2/3] feat(docker-camunda-bpm-platform): Added sql and postgresql version arguement related to #2692 --- README.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/README.md b/README.md index 31cf864e..19a2dac1 100644 --- a/README.md +++ b/README.md @@ -396,6 +396,17 @@ docker build -t camunda-bpm-platform \ --build-arg MAVEN_PROXY_PASSWORD=${PROXY_PASSWORD} \ . ``` +### Override MySQL and PostgreSQL driver versions. +By default, the driver versions are fetched from github.com/camunda/camunda-bpm-platform/blob/master/database/pom.xml. That can be overriden by passing `MYSQL_VERSION` and `POSTGRESQL_VERSION` build args + +``` +docker build -t camunda-bpm-platform \ + --build-arg DISTRO=${DISTRO} \ + --build-arg VERSION=${VERSION} \ + --build-arg POSTGRESQL_VERSION=${POSTGRESQL_VERSION} \ + --build-arg MYSQL_VERSION=${MYSQL_VERSION} \ + . +``` ## Use cases From 42f59d5f7d18cae89db69d424ce326502ea81409 Mon Sep 17 00:00:00 2001 From: punitdarira Date: Mon, 6 May 2024 08:53:23 -0400 Subject: [PATCH 3/3] Update README.md to make link clickable related to #2692 Co-authored-by: Daniel Kelemen --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 19a2dac1..0d5587d3 100644 --- a/README.md +++ b/README.md @@ -397,7 +397,7 @@ docker build -t camunda-bpm-platform \ . ``` ### Override MySQL and PostgreSQL driver versions. -By default, the driver versions are fetched from github.com/camunda/camunda-bpm-platform/blob/master/database/pom.xml. That can be overriden by passing `MYSQL_VERSION` and `POSTGRESQL_VERSION` build args +By default, the driver versions are fetched from https://github.com/camunda/camunda-bpm-platform/blob/master/database/pom.xml. That can be overriden by passing `MYSQL_VERSION` and `POSTGRESQL_VERSION` build args ``` docker build -t camunda-bpm-platform \