Skip to content

Commit 2eb1af2

Browse files
committed
fix: docker db drivers
JIRA: GRIF-15
1 parent 2d777f1 commit 2eb1af2

File tree

2 files changed

+24
-11
lines changed

2 files changed

+24
-11
lines changed

Dockerfile.jruby

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,24 @@ WORKDIR /src
99
ENV HOME=/src
1010
ENV BUNDLE_PATH=$HOME/bundle
1111

12-
RUN gem update --system \
13-
&& gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \
14-
&& gem install --install-dir $BUNDLE_PATH rake -v 13.0.6
15-
16-
ADD . .
1712

1813
# build postgresql dependencies
19-
RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging \
20-
&& cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/
14+
RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging
15+
RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/
2116

2217
# build mssql dependencies
23-
RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging \
24-
&& cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/
18+
RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging
19+
RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/
2520

2621
# build mysql dependencies
27-
RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging \
28-
&& cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/
22+
RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging
23+
RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/
24+
25+
RUN gem update --system \
26+
&& gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \
27+
&& gem install --install-dir $BUNDLE_PATH rake -v 13.0.6
28+
29+
ADD . .
2930

3031
# Import GoodData certificate to Java. This is needed for connection to ADS.
3132
# https://jira.intgdc.com/browse/TMA-300

Dockerfile.ruby

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,18 @@ RUN gem update --system \
1313
&& gem install --install-dir $BUNDLE_PATH bundler -v 2.4.6 \
1414
&& gem install --install-dir $BUNDLE_PATH rake -v 13.0.6
1515

16+
# build postgresql dependencies
17+
RUN mvn -f ci/postgresql/pom.xml clean install -P binary-packaging
18+
RUN cp -rf ci/postgresql/target/*.jar ./lib/gooddata/cloud_resources/postgresql/drivers/
19+
20+
# build mssql dependencies
21+
RUN mvn -f ci/mssql/pom.xml clean install -P binary-packaging
22+
RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/drivers/
23+
24+
# build mysql dependencies
25+
RUN mvn -f ci/mysql/pom.xml clean install -P binary-packaging
26+
RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/
27+
1628
ADD . .
1729

1830
CMD ["./bin/gooddata"]

0 commit comments

Comments
 (0)