From 66699f46bae5146c5c1589d2f896e77fc6714bbc Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Fri, 3 Jul 2026 15:07:35 -0700 Subject: [PATCH 01/19] 34037 - Refresh Data Dev --- jobs/colin-extract-refresh/Dockerfile | 2 +- jobs/colin-extract-refresh/src/corp.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 jobs/colin-extract-refresh/src/corp.txt diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 7f70d720d0..4ed0b9ca35 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -64,7 +64,7 @@ RUN apt-get update; \ ENV PATH="${DBSCHEMA_HOME}:${PATH}" -COPY src/ ./colin-exrtact-refresh/src/ +COPY src/ ./colin-extract-refresh/src/ RUN mkdir -p /opt/app-root/colin-extract-refresh/src/subset/generated && \ chmod -R 777 /opt/app-root/colin-extract-refresh/src/subset/generated /opt/app-root/.DbSchema diff --git a/jobs/colin-extract-refresh/src/corp.txt b/jobs/colin-extract-refresh/src/corp.txt new file mode 100644 index 0000000000..ddbb5dd67a --- /dev/null +++ b/jobs/colin-extract-refresh/src/corp.txt @@ -0,0 +1 @@ +BC123456 \ No newline at end of file From d9fb5c054d460e8f3e3826af3fba9ec3ec056620 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Fri, 3 Jul 2026 16:14:21 -0700 Subject: [PATCH 02/19] Added Oracle config --- jobs/colin-extract-refresh/src/dbschemacli_init.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/src/dbschemacli_init.py b/jobs/colin-extract-refresh/src/dbschemacli_init.py index 33bf617f57..36465a95d1 100644 --- a/jobs/colin-extract-refresh/src/dbschemacli_init.py +++ b/jobs/colin-extract-refresh/src/dbschemacli_init.py @@ -11,11 +11,18 @@ def write_dbschema_init(cfg: _Config) -> Path: host = cfg.DB_HOST_COLIN_MIGR port = int(cfg.DB_PORT_COLIN_MIGR) name = cfg.DB_NAME_COLIN_MIGR + + ora_user = cfg.DB_USER_COLIN_ORACLE + ora_password = cfg.DB_PASSWORD_COLIN_ORACLE + ora_host = cfg.DB_HOST_COLIN_ORACLE + ora_port = int(cfg.DB_PORT_COLIN_ORACLE) + ora_name = cfg.DB_NAME_COLIN_ORACLE lines = [ 'register driver PostgreSql org.postgresql.Driver jdbc:postgresql://:/?reWriteBatchedInserts=true "port=5432"', + 'register driver Oracle oracle.jdbc.OracleDriver jdbc:oracle:thin:@:: "port=1521"', f'connection my_proxy_test -d PostgreSql -u {user} -p {password} -h {host} -P {port} -D {name}', - + f'connection ctst -d Oracle -u {ora_user} -p {ora_password} -h {ora_host} -P {ora_port} -D {ora_name}', ] init_path.write_text('\n'.join(lines) + '\n') From 3f87563f0726c6b91dd10faa7d01c040284ca167 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 14:49:43 -0700 Subject: [PATCH 03/19] updated --- jobs/colin-extract-refresh/src/corp.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/src/corp.txt b/jobs/colin-extract-refresh/src/corp.txt index ddbb5dd67a..49098caf87 100644 --- a/jobs/colin-extract-refresh/src/corp.txt +++ b/jobs/colin-extract-refresh/src/corp.txt @@ -1 +1 @@ -BC123456 \ No newline at end of file +BC0009721 \ No newline at end of file From c6ab8e5b35a8ec913b51d6d97fafe16491e5dc9f Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 14:51:46 -0700 Subject: [PATCH 04/19] updated --- jobs/colin-extract-refresh/src/dbschemacli_init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/src/dbschemacli_init.py b/jobs/colin-extract-refresh/src/dbschemacli_init.py index 36465a95d1..c23f0f38e6 100644 --- a/jobs/colin-extract-refresh/src/dbschemacli_init.py +++ b/jobs/colin-extract-refresh/src/dbschemacli_init.py @@ -22,7 +22,7 @@ def write_dbschema_init(cfg: _Config) -> Path: 'register driver PostgreSql org.postgresql.Driver jdbc:postgresql://:/?reWriteBatchedInserts=true "port=5432"', 'register driver Oracle oracle.jdbc.OracleDriver jdbc:oracle:thin:@:: "port=1521"', f'connection my_proxy_test -d PostgreSql -u {user} -p {password} -h {host} -P {port} -D {name}', - f'connection ctst -d Oracle -u {ora_user} -p {ora_password} -h {ora_host} -P {ora_port} -D {ora_name}', + f'connection ctst_pg -d Oracle -u {ora_user} -p {ora_password} -h {ora_host} -P {ora_port} -D {ora_name}', ] init_path.write_text('\n'.join(lines) + '\n') From 0b6e4a9037b9cb02af49d557596442474388ecfa Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 14:54:10 -0700 Subject: [PATCH 05/19] updated --- jobs/colin-extract-refresh/src/test_connectivity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/src/test_connectivity.py b/jobs/colin-extract-refresh/src/test_connectivity.py index 452e9d9577..cdfc59630f 100644 --- a/jobs/colin-extract-refresh/src/test_connectivity.py +++ b/jobs/colin-extract-refresh/src/test_connectivity.py @@ -6,7 +6,7 @@ def main() -> int: print("== running test_connectivity.py ==") run_business_check() - # run_colin_check() + run_colin_check() print("== done test_connectivity.py ==") return 0 From a50d393d24e745a92ce822f542d8695b30b838a7 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 15:00:36 -0700 Subject: [PATCH 06/19] updated build changes --- jobs/colin-extract-refresh/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 4ed0b9ca35..6fc575a6ce 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -40,7 +40,7 @@ ENV DBSCHEMA_VERSION=9_7_1 RUN set -eux; \ apt-get update; \ apt-get install -y --no-install-recommends default-jre-headless curl;\ - curl -fsSL "https://www.dbschema.com/download/dbschema_unix_9_7_1.tar.gz" -o /tmp/dbschema.tar.gz;\ + curl --http1.1 -fsSL "https://www.dbschema.com/download/dbschema_unix_9_7_1.tar.gz" -o /tmp/dbschema.tar.gz;\ tar -xzf /tmp/dbschema.tar.gz -C /opt; \ rm /tmp/dbschema.tar.gz; \ mkdir -p "${DBSCHEMA_HOME}/lib"; \ From c6ab538eaea730aac6ac4314de74256b125fc9fc Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 15:04:36 -0700 Subject: [PATCH 07/19] updated --- jobs/colin-extract-refresh/src/dbschemacli_init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/colin-extract-refresh/src/dbschemacli_init.py b/jobs/colin-extract-refresh/src/dbschemacli_init.py index c23f0f38e6..ce31ac1fd3 100644 --- a/jobs/colin-extract-refresh/src/dbschemacli_init.py +++ b/jobs/colin-extract-refresh/src/dbschemacli_init.py @@ -22,7 +22,7 @@ def write_dbschema_init(cfg: _Config) -> Path: 'register driver PostgreSql org.postgresql.Driver jdbc:postgresql://:/?reWriteBatchedInserts=true "port=5432"', 'register driver Oracle oracle.jdbc.OracleDriver jdbc:oracle:thin:@:: "port=1521"', f'connection my_proxy_test -d PostgreSql -u {user} -p {password} -h {host} -P {port} -D {name}', - f'connection ctst_pg -d Oracle -u {ora_user} -p {ora_password} -h {ora_host} -P {ora_port} -D {ora_name}', + f'connection cprd -d Oracle -u {ora_user} -p {ora_password} -h {ora_host} -P {ora_port} -D {ora_name}', ] init_path.write_text('\n'.join(lines) + '\n') From 0de5ade12ef74787cc0239e781774e5a9005da6c Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 15:36:44 -0700 Subject: [PATCH 08/19] added oracle driver --- jobs/colin-extract-refresh/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 6fc575a6ce..7b7f932678 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -45,6 +45,8 @@ RUN set -eux; \ rm /tmp/dbschema.tar.gz; \ mkdir -p "${DBSCHEMA_HOME}/lib"; \ curl -fsSL "https://repo1.maven.org/maven2/org/testfx/openjfx-monocle/17.0.10/openjfx-monocle-17.0.10.jar" -o "${DBSCHEMA_HOME}/lib/monocle.jar"; \ + mkdir -p /root/.DbSchema/drivers/Oracle; \ + curl -fsSL "https://maven.org" -o /root/.DbSchema/drivers/Oracle/ojdbc11.jar; \ ln -sf "${DBSCHEMA_HOME}/DbSchemaCLI" /usr/local/bin/dbschemacli; \ test -x "${DBSCHEMA_HOME}/DbSchemaCLI"; \ rm -rf /var/lib/apt/lists/* From 04a61322a0e642052c86a449ab25f396528ddada Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 15:39:43 -0700 Subject: [PATCH 09/19] added config --- .../src/generate_cprd_subset_extract.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/jobs/colin-extract-refresh/src/generate_cprd_subset_extract.py b/jobs/colin-extract-refresh/src/generate_cprd_subset_extract.py index 2286e6cc9e..f33587a478 100644 --- a/jobs/colin-extract-refresh/src/generate_cprd_subset_extract.py +++ b/jobs/colin-extract-refresh/src/generate_cprd_subset_extract.py @@ -592,9 +592,9 @@ def _gen_emit_pg_disable_begin(lines: List[str], *, cfg: cfg_GenerationConfig, t lines.append(f"execute {tmpl_resolve_execute_path(templates.disable_triggers, out_dir=cfg.out_chunks_dir).as_posix()}") if cfg.mode == cfg_GenerationMode.REFRESH: lines.append("-- Refresh-only: preserved processing/tracking tables still reference corporation/event rows.") - lines.append("ALTER TABLE corp_processing DISABLE TRIGGER ALL;") - # lines.append("ALTER TABLE auth_processing DISABLE TRIGGER ALL;") - lines.append("ALTER TABLE colin_tracking DISABLE TRIGGER ALL;") + # lines.append("ALTER TABLE corp_processing DISABLE TRIGGER ALL;") + # # lines.append("ALTER TABLE auth_processing DISABLE TRIGGER ALL;") + # lines.append("ALTER TABLE colin_tracking DISABLE TRIGGER ALL;") lines.append("") return @@ -612,9 +612,9 @@ def _gen_emit_pg_disable_end(lines: List[str], *, cfg: cfg_GenerationConfig, tem lines.append(f"execute {tmpl_resolve_execute_path(templates.enable_triggers, out_dir=cfg.out_chunks_dir).as_posix()}") if cfg.mode == cfg_GenerationMode.REFRESH: lines.append("-- Refresh-only: restore preserved processing/tracking table triggers too.") - lines.append("ALTER TABLE corp_processing ENABLE TRIGGER ALL;") - # lines.append("ALTER TABLE auth_processing ENABLE TRIGGER ALL;") - lines.append("ALTER TABLE colin_tracking ENABLE TRIGGER ALL;") + # lines.append("ALTER TABLE corp_processing ENABLE TRIGGER ALL;") + # # lines.append("ALTER TABLE auth_processing ENABLE TRIGGER ALL;") + # lines.append("ALTER TABLE colin_tracking ENABLE TRIGGER ALL;") lines.append("") return From d9a48278b20142700bbf2cd387dc90e1f606d395 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Mon, 6 Jul 2026 16:53:39 -0700 Subject: [PATCH 10/19] updated config --- jobs/colin-extract-refresh/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 7b7f932678..3f358ca8b6 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -45,8 +45,6 @@ RUN set -eux; \ rm /tmp/dbschema.tar.gz; \ mkdir -p "${DBSCHEMA_HOME}/lib"; \ curl -fsSL "https://repo1.maven.org/maven2/org/testfx/openjfx-monocle/17.0.10/openjfx-monocle-17.0.10.jar" -o "${DBSCHEMA_HOME}/lib/monocle.jar"; \ - mkdir -p /root/.DbSchema/drivers/Oracle; \ - curl -fsSL "https://maven.org" -o /root/.DbSchema/drivers/Oracle/ojdbc11.jar; \ ln -sf "${DBSCHEMA_HOME}/DbSchemaCLI" /usr/local/bin/dbschemacli; \ test -x "${DBSCHEMA_HOME}/DbSchemaCLI"; \ rm -rf /var/lib/apt/lists/* @@ -54,6 +52,8 @@ RUN set -eux; \ ENV HOME=/opt/app-root RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar && \ + mkdir -p /opt/app-root/.DbSchema/drivers/Oracle; \ + curl -fsSL "https://maven.org" -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar; \ chmod -R g+rwX /opt/app-root/.DbSchema && \ chmod 755 /opt/app-root From 495b00d9e62464971fff1b4b3528afa491ef5e88 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 10:57:24 -0700 Subject: [PATCH 11/19] added driver --- jobs/colin-extract-refresh/Dockerfile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 3f358ca8b6..c3032a98cf 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -51,10 +51,12 @@ RUN set -eux; \ ENV HOME=/opt/app-root RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ - curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar && \ - mkdir -p /opt/app-root/.DbSchema/drivers/Oracle; \ - curl -fsSL "https://maven.org" -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar; \ - chmod -R g+rwX /opt/app-root/.DbSchema && \ + curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar + +RUN printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ + dbschemacli /tmp/download_oracle_driver.sql + +RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ chmod 755 /opt/app-root WORKDIR /opt/app-root From ff1326d88f1c3ec37bbaead99bfda75600a4e6cb Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 13:30:26 -0700 Subject: [PATCH 12/19] updated driver extraction --- jobs/colin-extract-refresh/Dockerfile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index c3032a98cf..fbe708d9ac 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -54,7 +54,12 @@ RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/Postgre curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar RUN printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ - dbschemacli /tmp/download_oracle_driver.sql + mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ + dbschemacli /tmp/download_oracle_driver.sql && \ + if [ -f /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip ]; then \ + unzip -o /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ + rm -f /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip; \ + fi RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ chmod 755 /opt/app-root @@ -78,5 +83,4 @@ EXPOSE 8080 COPY src . -ENTRYPOINT ["python", "generate_cprd_subset_extract.py"] -CMD ["--corp-file", "corp.txt", "--mode", "refresh"] +CMD ["/bin/sh", "-c", "python /opt/app-root/colin-extract-refresh/src/generate_cprd_subset_extract.py --corp-file corp.txt --target-connection my_proxy_test --target-schema colin_extract_temp --mode refresh && dbschemacli /opt/app-root/colin-extract-refresh/src/subset/generated/subset_refresh.sql"] \ No newline at end of file From 7999920f3bf24ea003201e2c985c164e9ef04b30 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 14:10:53 -0700 Subject: [PATCH 13/19] updated driver removal --- jobs/colin-extract-refresh/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index fbe708d9ac..ad5d3d608a 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -56,9 +56,9 @@ RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/Postgre RUN printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ dbschemacli /tmp/download_oracle_driver.sql && \ - if [ -f /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip ]; then \ - unzip -o /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ - rm -f /opt/app-root/.DbSchema/drivers/Oracle/drivers.zip; \ + if [ -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip ]; then \ + unzip -o /opt/app-root/.DbSchema/drivers/Oracle/driver.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ + rm -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip; \ fi RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ @@ -83,4 +83,4 @@ EXPOSE 8080 COPY src . -CMD ["/bin/sh", "-c", "python /opt/app-root/colin-extract-refresh/src/generate_cprd_subset_extract.py --corp-file corp.txt --target-connection my_proxy_test --target-schema colin_extract_temp --mode refresh && dbschemacli /opt/app-root/colin-extract-refresh/src/subset/generated/subset_refresh.sql"] \ No newline at end of file +CMD ["/bin/sh", "-c", "python /opt/app-root/colin-extract-refresh/src/test_connectivity.py && python /opt/app-root/colin-extract-refresh/src/generate_cprd_subset_extract.py --corp-file corp.txt --target-connection my_proxy_test --target-schema colin_extract_temp --mode refresh && dbschemacli /opt/app-root/colin-extract-refresh/src/subset/generated/subset_refresh.sql"] \ No newline at end of file From 76f1a06dab7c72905ec415ae516d105d8cc194c0 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 14:18:26 -0700 Subject: [PATCH 14/19] updated docker file --- jobs/colin-extract-refresh/Dockerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index ad5d3d608a..7b16db5289 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -56,10 +56,8 @@ RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/Postgre RUN printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ dbschemacli /tmp/download_oracle_driver.sql && \ - if [ -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip ]; then \ - unzip -o /opt/app-root/.DbSchema/drivers/Oracle/driver.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ - rm -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip; \ - fi + unzip -o /opt/app-root/.DbSchema/drivers/Oracle/driver.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ + rm -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ chmod 755 /opt/app-root From 9e46855f252b7166e9df1c1eae09081e99573028 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 14:56:48 -0700 Subject: [PATCH 15/19] updated --- jobs/colin-extract-refresh/Dockerfile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 7b16db5289..d0a822dc3b 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -51,13 +51,11 @@ RUN set -eux; \ ENV HOME=/opt/app-root RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ - curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar - -RUN printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ + curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar && \ mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ - dbschemacli /tmp/download_oracle_driver.sql && \ - unzip -o /opt/app-root/.DbSchema/drivers/Oracle/driver.zip -d /opt/app-root/.DbSchema/drivers/Oracle && \ - rm -f /opt/app-root/.DbSchema/drivers/Oracle/driver.zip + curl -fsSL "https://maven.org" \ + -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar + RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ chmod 755 /opt/app-root From fdeebf364a9021fd7e1ffebc103694cee1d1ffc1 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 15:01:05 -0700 Subject: [PATCH 16/19] updated --- jobs/colin-extract-refresh/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index d0a822dc3b..58e4142065 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -53,8 +53,7 @@ ENV HOME=/opt/app-root RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar && \ mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ - curl -fsSL "https://maven.org" \ - -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar + curl -fsSL "https://maven.org" -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ From 4a3bced50ddf3c25461fd00660f8b9cec84b1446 Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 16:23:34 -0700 Subject: [PATCH 17/19] added config --- jobs/colin-extract-refresh/Dockerfile | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 58e4142065..da3f5aa1af 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -50,10 +50,13 @@ RUN set -eux; \ rm -rf /var/lib/apt/lists/* ENV HOME=/opt/app-root -RUN mkdir -p /opt/app-root/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ - curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o /opt/app-root/.DbSchema/drivers/PostgreSql/postgresql.jar && \ - mkdir -p /opt/app-root/.DbSchema/drivers/Oracle && \ - curl -fsSL "https://maven.org" -o /opt/app-root/.DbSchema/drivers/Oracle/ojdbc11.jar + +RUN mkdir -p ${HOME}/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ + curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o ${HOME}/.DbSchema/drivers/PostgreSql/postgresql.jar && \ + mkdir -p ${HOME}/.DbSchema/drivers/Oracle && \ + curl -fsSL "https://maven.org" -o ${HOME}/.DbSchema/drivers/Oracle/ojdbc11.jar && \ + chown -R 1001:0 ${HOME}/.DbSchema && \ + chmod -R g+rwX ${HOME}/.DbSchema RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ From fe092765be390ff4f0b50578cd9d7df834041a7a Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Wed, 8 Jul 2026 16:29:40 -0700 Subject: [PATCH 18/19] updated --- jobs/colin-extract-refresh/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index da3f5aa1af..016e5e1e0e 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -55,11 +55,12 @@ RUN mkdir -p ${HOME}/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o ${HOME}/.DbSchema/drivers/PostgreSql/postgresql.jar && \ mkdir -p ${HOME}/.DbSchema/drivers/Oracle && \ curl -fsSL "https://maven.org" -o ${HOME}/.DbSchema/drivers/Oracle/ojdbc11.jar && \ - chown -R 1001:0 ${HOME}/.DbSchema && \ - chmod -R g+rwX ${HOME}/.DbSchema + unzip -o $HOME/.DbSchema/drivers/Oracle/driver.zip -d $HOME/.DbSchema/drivers/Oracle/ + + -RUN chmod -R g+rwX /opt/app-root/.DbSchema && \ +RUN chmod 755 $HOME/.DbSchema/drivers/Oracle/ && \ chmod 755 /opt/app-root WORKDIR /opt/app-root From fe9b4b16cdc9f148c55c499dd64a6525989f3afa Mon Sep 17 00:00:00 2001 From: Rajandeep Date: Thu, 9 Jul 2026 11:14:10 -0700 Subject: [PATCH 19/19] updated --- jobs/colin-extract-refresh/Dockerfile | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/jobs/colin-extract-refresh/Dockerfile b/jobs/colin-extract-refresh/Dockerfile index 016e5e1e0e..ced0de22f1 100644 --- a/jobs/colin-extract-refresh/Dockerfile +++ b/jobs/colin-extract-refresh/Dockerfile @@ -51,16 +51,20 @@ RUN set -eux; \ ENV HOME=/opt/app-root -RUN mkdir -p ${HOME}/.DbSchema/cli /opt/app-root/.DbSchema/drivers/PostgreSql && \ +RUN mkdir -p ${HOME}/.DbSchema/cli ${HOME}/.DbSchema/drivers/PostgreSql ${HOME}/.DbSchema/drivers/Oracle && \ curl -fsSL "https://repo1.maven.org/maven2/org/postgresql/postgresql/42.7.4/postgresql-42.7.4.jar" -o ${HOME}/.DbSchema/drivers/PostgreSql/postgresql.jar && \ - mkdir -p ${HOME}/.DbSchema/drivers/Oracle && \ - curl -fsSL "https://maven.org" -o ${HOME}/.DbSchema/drivers/Oracle/ojdbc11.jar && \ - unzip -o $HOME/.DbSchema/drivers/Oracle/driver.zip -d $HOME/.DbSchema/drivers/Oracle/ - - - + printf '%s\n' 'download driver oracle' > /tmp/download_oracle_driver.sql && \ + dbschemacli /tmp/download_oracle_driver.sql && \ + if [ -f /root/.DbSchema/drivers/oracle/driver.zip ]; then \ + unzip -o /root/.DbSchema/drivers/oracle/driver.zip -d ${HOME}/.DbSchema/drivers/Oracle/; \ + elif [ -f ${HOME}/.DbSchema/drivers/oracle/driver.zip ]; then \ + unzip -o ${HOME}/.DbSchema/drivers/oracle/driver.zip -d ${HOME}/.DbSchema/drivers/Oracle/; \ + else \ + echo "Oracle JDBC driver download failed" >&2; exit 1; \ + fi && \ + rm -rf /root/.DbSchema/drivers/oracle ${HOME}/.DbSchema/drivers/oracle/driver.zip -RUN chmod 755 $HOME/.DbSchema/drivers/Oracle/ && \ +RUN chmod -R g+rwX ${HOME}/.DbSchema && \ chmod 755 /opt/app-root WORKDIR /opt/app-root