Skip to content

feat(jans-pycloudlib): add support for connecting to cloudsql via cloud auth proxy #12788

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
moabu wants to merge 21 commits into
base: main
Choose a base branch
from
Open

feat(jans-pycloudlib): add support for connecting to cloudsql via cloud auth proxy #12788

Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
e2408a1
feat: add support for connecting to cloudsql via cloud auth proxy
moabu Dec 1, 2025
99fa5aa
Merge branch 'main' into cn-add-cloud-auth-proxy
moabu Dec 1, 2025
edf7edf
fix: added context manager support
moabu Dec 1, 2025
f541b16
fix: refactor for cleanup
moabu Dec 1, 2025
e9c2187
fix: the getconn closure to fetch the password fresh on each connecti…
moabu Dec 1, 2025
f75e2b3
chore: update dockerfile jans source version
moabu Dec 1, 2025
a7dba0f
chore: install cloud sql python
moabu Dec 1, 2025
5343272
docs: fix get manager example
moabu Dec 2, 2025
16ba36d
chore: update jans source version
moabu Dec 2, 2025
6a7305c
style: cosmetic touch
moabu Dec 2, 2025
f86e7bc
Merge branch 'main' into cn-add-cloud-auth-proxy
moabu Dec 2, 2025
7ef8dc8
fix: add defensive check for cloudsql driver
moabu Dec 2, 2025
717fb68
fix: improve error logging when closing database connections
moabu Dec 2, 2025
04be023
fix(docker-jans-auth-server): implemented Cloud SQL JDBC Socket Facto…
moabu Dec 2, 2025
be95dc6
fix(docker): implemented Cloud SQL JDBC Socket Factory support for Ja…
moabu Dec 3, 2025
01995d3
chore(docker): update source version
moabu Dec 3, 2025
9489a96
fix(docker): build with jar deps
moabu Dec 4, 2025
4506c30
chore(docker): update jans source version
moabu Dec 4, 2025
cff424d
chore(docker): fix maven build
moabu Dec 4, 2025
df2f7d1
ci: add clean up
moabu Dec 4, 2025
b68323d
ci: add clean up
moabu Dec 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docker-jans-all-in-one/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN apk update \
# Assets sync
# ===========

ENV JANS_SOURCE_VERSION=4cf1bf2085bbdeab678e51ab3aff34d4c48be96b
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad

# note that as we're pulling from a monorepo (with multiple project in it)
# we are using partial-clone and sparse-checkout to get the assets
Expand Down
22 changes: 16 additions & 6 deletions docker-jans-auth-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,16 +65,26 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/webapps \
# ===========

RUN mkdir -p /usr/share/java \
${JETTY_BASE}/jans-auth/_libs
${JETTY_BASE}/jans-auth/_libs \
${JETTY_BASE}/jans-auth/custom/libs

ARG TWILIO_VERSION=7.17.0
ARG JSMPP_VERSION=2.3.7
ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download custom libs directly to custom/libs (always available)
RUN wget -q https://repo1.maven.org/maven2/com/twilio/sdk/twilio/${TWILIO_VERSION}/twilio-${TWILIO_VERSION}.jar -P ${JETTY_BASE}/jans-auth/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/org/jsmpp/jsmpp/${JSMPP_VERSION}/jsmpp-${JSMPP_VERSION}.jar -P ${JETTY_BASE}/jans-auth/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-auth/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-auth/custom/libs/ \
&& for custom_lib in casa-config jans-fido2-client jans-fido2-model agama-inbound cedarling-java; \
do \
wget -nv "https://jenkins.jans.io/maven/io/jans/${custom_lib}/${CN_VERSION}/${custom_lib}-${CN_VERSION}.jar" -P "${JETTY_BASE}/jans-auth/custom/libs"; \
done

RUN wget -q https://repo1.maven.org/maven2/com/twilio/sdk/twilio/${TWILIO_VERSION}/twilio-${TWILIO_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs/ \
&& wget -q https://repo1.maven.org/maven2/org/jsmpp/jsmpp/${JSMPP_VERSION}/jsmpp-${JSMPP_VERSION}.jar -P ${JETTY_BASE}/jans-auth/_libs/ \
&& for custom_lib in casa-config jans-fido2-client jans-fido2-model agama-inbound jans-lock-service jans-lock-model jans-lock-cedarling cedarling-java; \
RUN for lock_lib in jans-lock-service jans-lock-model jans-lock-cedarling; \
do \
wget -nv "https://jenkins.jans.io/maven/io/jans/${custom_lib}/${CN_VERSION}/${custom_lib}-${CN_VERSION}.jar" -P "${JETTY_BASE}/jans-auth/_libs"; \
wget -nv "https://jenkins.jans.io/maven/io/jans/${lock_lib}/${CN_VERSION}/${lock_lib}-${CN_VERSION}.jar" -P "${JETTY_BASE}/jans-auth/_libs"; \
done

# ===========
Expand All @@ -88,7 +98,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \
/app/static/rdbm \
/app/schema

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
7 changes: 3 additions & 4 deletions docker-jans-auth-server/scripts/bootstrap.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,11 +176,10 @@ def configure_logging():
def copy_builtin_libs():
lock_enabled = as_boolean(os.environ.get("CN_LOCK_ENABLED", "false"))

for src in Path("/opt/jans/jetty/jans-auth/_libs").glob("*.jar"):
# skip jans-lock-service and jans-lock-model
if lock_enabled is False and src.name.startswith("jans-lock"):
continue
if not lock_enabled:
return

for src in Path("/opt/jans/jetty/jans-auth/_libs").glob("jans-lock*.jar"):
dst = f"/opt/jans/jetty/jans-auth/custom/libs/{src.name}"
shutil.copyfile(src, dst)

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-auth-server/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
13 changes: 12 additions & 1 deletion docker-jans-casa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ RUN mkdir -p /app/static/rdbm \
/app/schema \
/app/templates/jans-casa

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down Expand Up @@ -206,6 +206,17 @@ LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/casa" \
org.opencontainers.image.title="Janssen Casa" \
org.opencontainers.image.description="Self-service portal for people to manage their account security preferences in the Janssen, like 2FA"

# ===========
# Custom libs
# ===========

ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download Cloud SQL JDBC Socket Factory JARs directly to custom/libs (always available)
RUN mkdir -p ${JETTY_BASE}/jans-casa/custom/libs \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-casa/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-casa/custom/libs/

RUN mkdir -p /opt/jans/python/libs \
${JETTY_BASE}/jans-casa/static \
${JETTY_BASE}/jans-casa/plugins \
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-casa/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-cloudtools/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/codehaus/janino/janino/3.1.9/jani
# Assets sync
# ===========

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad

# note that as we're pulling from a monorepo (with multiple project in it)
# we are using partial-clone and sparse-checkout to get the assets
Expand Down
14 changes: 12 additions & 2 deletions docker-jans-config-api/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ RUN mkdir -p /etc/jans/conf \
/usr/share/java \
/opt/jans/bin

ENV JANS_SOURCE_VERSION=4cf1bf2085bbdeab678e51ab3aff34d4c48be96b
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources

Expand Down Expand Up @@ -232,8 +232,18 @@ LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/config-api" \
org.opencontainers.image.title="Janssen Config API" \
org.opencontainers.image.description=""

# ===========
# Custom libs
# ===========

ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download Cloud SQL JDBC Socket Factory JARs directly to custom/libs (always available)
RUN mkdir -p ${JETTY_BASE}/jans-config-api/custom/libs \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-config-api/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-config-api/custom/libs/
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🌐 Web query:

Cloud SQL JDBC Socket Factory version 1.27.0 Maven Central latest release

💡 Result:

Yes — Cloud SQL JDBC Socket Factory 1.27.0 is published on Maven Central (release date Oct 30, 2025).

Maven coordinates (parent/core & driver artifacts):

  • com.google.cloud.sql:jdbc-socket-factory-parent:1.27.0. [1]
  • com.google.cloud.sql:jdbc-socket-factory-core:1.27.0. [2]
  • driver-specific artifacts (example): com.google.cloud.sql:postgres-socket-factory:1.27.0 (also available). [1]

Maven example:

com.google.cloud.sql
postgres-socket-factory
1.27.0

Gradle example:
implementation "com.google.cloud.sql:postgres-socket-factory:1.27.0"

Sources: Maven Central listings. [1][2]

🌐 Web query:

google-cloud-sql mysql-socket-factory-connector-j-8 latest version

💡 Result:

The latest released version on Maven Central is 1.25.0 (released Apr 28, 2025). [1][2]

Sources:

  • mvnrepository.com listing for com.google.cloud.sql:mysql-socket-factory-connector-j-8 — version 1.25.0. [1]
  • Maven Central (package artifact overview showing recent versions). [2]

References:
[1] (mvnrepository.com)
[2] (central.sonatype.com)

Citations:

🌐 Web query:

google-cloud-sql postgres-socket-factory latest version

💡 Result:

The latest released version of com.google.cloud.sql:postgres-socket-factory is 1.27.0 (released Oct 30, 2025). [1][2]

Sources:

  • Artifact listing showing 1.27.0 as the newest release. [1]
  • 1.26.1 release page for context (previous release). [2]

[1] https://mvnrepository.com/artifact/com.google.cloud.sql/postgres-socket-factory
[2] https://mvnrepository.com/artifact/com.google.cloud.sql/postgres-socket-factory/1.26.1

Update mysql-socket-factory-connector-j-8 to version 1.25.0, the latest stable release on Maven Central.

The postgres-socket-factory 1.27.0 is current (released Oct 30, 2025), but mysql-socket-factory-connector-j-8 latest available version is 1.25.0 (released Apr 28, 2025). Using mismatched versions across the two artifacts may cause compatibility issues. Consider adding checksum verification for downloaded JARs to strengthen supply chain security.


RUN mkdir -p /etc/certs \
${JETTY_BASE}/jans-config-api/custom/libs \
${JETTY_BASE}/jans-config-api/custom/config/adminUI \
${JETTY_BASE}/jans-config-api/logs \
${JETTY_BASE}/common/libs \
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-config-api/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s
Copy link
Contributor

@coderabbitai coderabbitai bot Dec 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟠 Major

🧩 Analysis chain

🏁 Script executed:

# Find files related to database connection URI construction
find . -type f -name "*.py" -o -name "*.properties" | head -20

Repository: JanssenProject/jans

Length of output: 1028

🏁 Script executed:

# Search for rdbm_connection_uri construction
rg "rdbm_connection_uri" --type-list | head -20

Repository: JanssenProject/jans

Length of output: 452

🏁 Script executed:

# Search for where connection URIs are built
rg "connection\.uri" -A 3 -B 3 --type properties

Repository: JanssenProject/jans

Length of output: 97

🏁 Script executed:

# Find references to pg8000 and cloud-sql-python-connector
rg "pg8000|cloud.sql.python.connector|cloud-sql-python-connector" -i

Repository: JanssenProject/jans

Length of output: 2981

🏁 Script executed:

# Look for PostgreSQL connection configuration
rg "postgresql|postgres" -i --type properties --type python -B 2 -A 2 | head -50

Repository: JanssenProject/jans

Length of output: 149

🏁 Script executed:

# Search for rdbm_connection_uri in all file types
rg "rdbm_connection_uri"

Repository: JanssenProject/jans

Length of output: 1475

🏁 Script executed:

# Find jans-config-api related files
find . -path "*/docker-jans-config-api/*" -type f | grep -E "\.(py|sh|properties)$" | head -30

Repository: JanssenProject/jans

Length of output: 590

🏁 Script executed:

# Look at jans-pgsql.properties and surrounding configuration
find . -name "jans-pgsql.properties" -o -name "jans-mysql.properties"

Repository: JanssenProject/jans

Length of output: 928

🏁 Script executed:

# Search for how these template properties are used/interpolated
rg "rdbm_host|rdbm_port|rdbm_db" -A 2 -B 2 | head -80

Repository: JanssenProject/jans

Length of output: 6568

🏁 Script executed:

# Look for entrypoint or configuration scripts in docker-jans-config-api
find ./docker-jans-config-api -type f \( -name "*.py" -o -name "*.sh" \) | head -20

Repository: JanssenProject/jans

Length of output: 476

🏁 Script executed:

# Find the _build_jdbc_connection_uri function
rg "_build_jdbc_connection_uri" -A 20 -B 2

Repository: JanssenProject/jans

Length of output: 4210

🏁 Script executed:

# Look at the entire sql.py file to understand the context
cat jans-pycloudlib/jans/pycloudlib/persistence/sql.py | head -200

Repository: JanssenProject/jans

Length of output: 7552

🏁 Script executed:

# Get more of the sql.py file focusing on the URI building logic
rg "def _build_jdbc_connection_uri" -A 30

Repository: JanssenProject/jans

Length of output: 3055

🏁 Script executed:

# Get the complete function implementation
rg "def _build_jdbc_connection_uri" -A 60

Repository: JanssenProject/jans

Length of output: 5694

🏁 Script executed:

# Check if there are separate SSL properties for PostgreSQL in the templates
cat ./docker-jans-config-api/templates/jans-pgsql.properties

Repository: JanssenProject/jans

Length of output: 1275

🏁 Script executed:

# Compare with old PostgreSQL templates to see how SSL was handled before
cat ./jans-linux-setup/jans_setup/templates/jans-pgsql.properties

Repository: JanssenProject/jans

Length of output: 1472

Missing SSL/TLS configuration for standard PostgreSQL connections.

The template migration removed critical SSL/TLS driver properties (ssl, sslmode, sslfactory) that were present in the original configuration. While Cloud SQL connections use the socketFactory mechanism for SSL, standard PostgreSQL deployments now have no explicit TLS configuration.

The _build_jdbc_connection_uri() function returns jdbc:postgresql://host:port/dbname for non-Cloud SQL deployments, lacking the SSL parameters that should be included. MySQL connections compensate by including enabledTLSProtocols=TLSv1.2 in the URI, but PostgreSQL does not.

Ensure that SSL/TLS settings are either:

  1. Included in the URI via sslmode parameter (e.g., ?sslmode=require), or
  2. Added back as driver properties in the template
🤖 Prompt for AI Agents 
In docker-jans-config-api/templates/jans-pgsql.properties around line 3, the
generated JDBC URI for standard PostgreSQL lacks TLS options
(ssl/sslmode/sslfactory) so non-Cloud-SQL deployments no longer enable TLS;
update the template to either append SSL parameters to the connection.uri (for
example add a configurable query string like ?sslmode=require or
?ssl=true&sslmode=require&enabledTLSProtocols=TLSv1.2 using an injected template
variable) or reintroduce driver properties (ssl=true, sslmode=require and
optional sslfactory) in the properties file, while preserving the existing
socketFactory logic for Cloud SQL paths so those keep using the socket factory
instead of redundant SSL params.


# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-configurator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RUN mkdir -p /opt/jans/configurator/javalibs \
# Assets sync
# ===========

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad

ARG GIT_CLONE_DEPTH=100
WORKDIR /tmp/jans
Expand Down
14 changes: 12 additions & 2 deletions docker-jans-fido2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ RUN mkdir -p /etc/jans/conf \
/app/templates/jans-fido2 \
/app/static/fido2

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down Expand Up @@ -209,9 +209,19 @@ LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/fido2" \
org.opencontainers.image.title="Janssen FIDO2" \
org.opencontainers.image.description="FIDO2 server"

# ===========
# Custom libs
# ===========

ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download Cloud SQL JDBC Socket Factory JARs directly to custom/libs (always available)
RUN mkdir -p ${JETTY_BASE}/jans-fido2/custom/libs \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-fido2/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-fido2/custom/libs/

RUN mkdir -p /etc/certs \
${JETTY_BASE}/jans-fido2/logs \
${JETTY_BASE}/jans-fido2/custom/libs \
${JETTY_BASE}/common/libs \
${JETTY_HOME}/temp \
/usr/share/java
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-fido2/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
14 changes: 12 additions & 2 deletions docker-jans-link/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ RUN mkdir -p /etc/jans/conf \
/app/schema \
/app/templates/jans-link

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down Expand Up @@ -200,9 +200,19 @@ LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/link" \
org.opencontainers.image.title="Janssen Link" \
org.opencontainers.image.description=""

# ===========
# Custom libs
# ===========

ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download Cloud SQL JDBC Socket Factory JARs directly to custom/libs (always available)
RUN mkdir -p ${JETTY_BASE}/jans-link/custom/libs \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-link/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-link/custom/libs/

RUN mkdir -p /etc/certs \
${JETTY_BASE}/jans-link/logs \
${JETTY_BASE}/jans-link/custom/libs \
${JETTY_BASE}/common/libs \
${JETTY_HOME}/temp \
/usr/share/java \
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-link/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-monolith/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ EXPOSE 443 8080 1636
# jans-linux-setup
# =====================

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad

# cleanup
RUN rm -rf /tmp/jans
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-persistence-loader/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ RUN apk update \
RUN mkdir -p /app/static /app/schema /app/static/opendj /app/templates

# janssenproject/jans SHA commit
ENV JANS_SOURCE_VERSION=4cf1bf2085bbdeab678e51ab3aff34d4c48be96b
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCRIPT_CATALOG_DIR=docs/script-catalog
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-saml/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RUN mkdir -p /app/static/rdbm \
/app/schema \
/app/templates/jans-saml

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-saml/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-saml/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
14 changes: 12 additions & 2 deletions docker-jans-scim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ RUN mkdir -p /etc/jans/conf \
/app/schema \
/app/templates/jans-scim

ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources

Expand Down Expand Up @@ -203,9 +203,19 @@ LABEL org.opencontainers.image.url="ghcr.io/janssenproject/jans/scim" \
org.opencontainers.image.title="Janssen SCIM" \
org.opencontainers.image.description="SCIM server"

# ===========
# Custom libs
# ===========

ARG CLOUDSQL_SOCKET_FACTORY_VERSION=1.27.0

# Download Cloud SQL JDBC Socket Factory JARs directly to custom/libs (always available)
RUN mkdir -p ${JETTY_BASE}/jans-scim/custom/libs \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/mysql-socket-factory-connector-j-8/${CLOUDSQL_SOCKET_FACTORY_VERSION}/mysql-socket-factory-connector-j-8-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-scim/custom/libs/ \
&& wget -q https://repo1.maven.org/maven2/com/google/cloud/sql/postgres-socket-factory/${CLOUDSQL_SOCKET_FACTORY_VERSION}/postgres-socket-factory-${CLOUDSQL_SOCKET_FACTORY_VERSION}.jar -P ${JETTY_BASE}/jans-scim/custom/libs/

RUN mkdir -p /etc/certs \
${JETTY_BASE}/jans-scim/logs \
${JETTY_BASE}/jans-scim/custom/libs \
${JETTY_BASE}/common/libs \
${JETTY_HOME}/temp \
/usr/share/java
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/templates/jans-mysql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:mysql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s?enabledTLSProtocols=TLSv1.2
connection.uri=%(rdbm_connection_uri)s

connection.driver-property.serverTimezone=%(server_time_zone)s
# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-scim/templates/jans-pgsql.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
db.schema.name=%(rdbm_schema)s

connection.uri=jdbc:postgresql://%(rdbm_host)s:%(rdbm_port)s/%(rdbm_db)s
connection.uri=%(rdbm_connection_uri)s

# Prefix connection.driver-property.key=value will be coverterd to key=value JDBC driver properties
#connection.driver-property.driverProperty=driverPropertyValu
Expand Down
2 changes: 1 addition & 1 deletion jans-cedarling/flask-sidecar/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ RUN pip3 install "poetry==$POETRY_VERSION" gunicorn \
# ===============
# Project setup
# ===============
ENV JANS_SOURCE_VERSION=04d297c046dd9d8ef54c0544e6187153b7ed87cf
ENV JANS_SOURCE_VERSION=be95dc67a0f482b417aaab2e13ff9bde09f8d7ad

COPY docker-entrypoint.sh /
RUN chmod +x /docker-entrypoint.sh
Expand Down
Loading