From 569e5100839245cd5869bb12b655b7fe571fbbcf Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Wed, 7 May 2025 13:06:05 -0700 Subject: [PATCH] feat: build docker w/ Oracle's libmysqlclient (#1695) instead of libmariadb as we still need the Oracle client's seamless TLS support (for now) Closes STOR-250 --- .circleci/config.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index bf1b4077..cb74a24c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -309,7 +309,10 @@ jobs: - write-version - run: name: Build MySQL Docker image - command: docker build -t app:build --build-arg DATABASE_BACKEND=mysql . + command: > + docker build -t app:build + --build-arg DATABASE_BACKEND=mysql + . no_output_timeout: 30m # save the built docker container into CircleCI's cache. This is # required since Workflows do not have the same remote docker instance. @@ -341,7 +344,12 @@ jobs: - write-version - run: name: Build Spanner Docker image - command: docker build -t app:build --build-arg DATABASE_BACKEND=spanner . + # Build w/ the Oracle libmysqlclient-dev for TLS support + command: > + docker build -t app:build + --build-arg DATABASE_BACKEND=spanner + --build-arg MYSQLCLIENT_PKG=libmysqlclient-dev + . no_output_timeout: 30m # save the built docker container into CircleCI's cache. This is # required since Workflows do not have the same remote docker instance.