From 2eb1af2e04af6fec364ee8dee00aa0800fc2665d Mon Sep 17 00:00:00 2001 From: Milan Dufek Date: Tue, 11 Feb 2025 14:52:39 +0100 Subject: [PATCH] fix: docker db drivers JIRA: GRIF-15 --- Dockerfile.jruby | 23 ++++++++++++----------- Dockerfile.ruby | 12 ++++++++++++ 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/Dockerfile.jruby b/Dockerfile.jruby index e02d0818f..08709fb64 100644 --- a/Dockerfile.jruby +++ b/Dockerfile.jruby @@ -9,23 +9,24 @@ WORKDIR /src ENV HOME=/src ENV BUNDLE_PATH=$HOME/bundle -RUN gem update --system \ - && gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \ - && gem install --install-dir $BUNDLE_PATH rake -v 13.0.6 - -ADD . . # build postgresql dependencies -RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging \ - && cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/ +RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/ # build mssql dependencies -RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging \ - && cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/ +RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/ # build mysql dependencies -RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging \ - && cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/ +RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/ + +RUN gem update --system \ + && gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \ + && gem install --install-dir $BUNDLE_PATH rake -v 13.0.6 + +ADD . . # Import GoodData certificate to Java. This is needed for connection to ADS. # https://jira.intgdc.com/browse/TMA-300 diff --git a/Dockerfile.ruby b/Dockerfile.ruby index 3569cc85d..02c17c9cb 100644 --- a/Dockerfile.ruby +++ b/Dockerfile.ruby @@ -13,6 +13,18 @@ RUN gem update --system \ && gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \ && gem install --install-dir $BUNDLE_PATH rake -v 13.0.6 +# build postgresql dependencies +RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/ + +# build mssql dependencies +RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/ + +# build mysql dependencies +RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging +RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/ + ADD . . CMD ["./bin/gooddata"]