-
Notifications
You must be signed in to change notification settings - Fork 123
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
STL-716: Allow LCM Bricks run with C9S and java11
- Loading branch information
1 parent
dc0cf98
commit 91fb09b
Showing
7 changed files
with
66 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,15 @@ | ||
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665 | ||
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202403271423.8c7c22c | ||
|
||
ARG RVM_VERSION=stable | ||
ARG JRUBY_VERSION=9.4.1.0 | ||
|
||
LABEL image_name="GDC LCM Bricks" | ||
LABEL maintainer="LCM <[email protected]>" | ||
LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/" | ||
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665" | ||
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202312060945.d0814f3" | ||
|
||
# which is required by RVM | ||
RUN yum install -y which patch make git maven procps \ | ||
RUN yum install -y which patch make unzip gnupg git maven procps gzip \ | ||
&& yum clean all \ | ||
&& rm -rf /var/cache/yum | ||
|
||
|
@@ -33,9 +33,6 @@ RUN rvm install jruby-${JRUBY_VERSION} && gem update --system \ | |
&& gem install bundler -v 2.4.6 \ | ||
&& gem install rake -v 13.0.6 | ||
|
||
# Make sure java default running with java8 | ||
RUN update-alternatives --set java java-1.8.0-openjdk.x86_64 | ||
|
||
WORKDIR /src | ||
|
||
RUN groupadd -g 48 apache \ | ||
|
@@ -78,10 +75,11 @@ RUN cp -rf ci/mssql/target/*.jar ./lib/gooddata/cloud_resources/mssql/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 bundle install | ||
#build datawarehouse dependencies | ||
RUN mvn -f ci/datawarehouse/pom.xml clean install -P binary-packaging | ||
RUN cp -rf ci/datawarehouse/target/*.jar ./lib/gooddata/cloud_resources/datawarehouse/drivers/ | ||
|
||
# Check to make sure Java version is always Java8 | ||
RUN java_version=$(java -version 2>&1) && echo "$java_version" | grep 'version.*1.8' || (echo "Java version is not 1.8" && exit 1) | ||
RUN bundle install | ||
|
||
ARG GIT_COMMIT=unspecified | ||
ARG BRICKS_VERSION=unspecified | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.7.68 | ||
3.7.69 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,44 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<project xmlns="http://maven.apache.org/POM/4.0.0" | ||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> | ||
<modelVersion>4.0.0</modelVersion> | ||
|
||
<groupId>com.gooddata.lcm</groupId> | ||
<artifactId>lcm-datawarehouse-driver</artifactId> | ||
<version>1.0-SNAPSHOT</version> | ||
|
||
<dependencies> | ||
<dependency> | ||
<groupId>com.gooddata.datawarehouse.jdbc</groupId> | ||
<artifactId>datawarehouse-jdbc-driver</artifactId> | ||
<version>3.6.0</version> | ||
</dependency> | ||
</dependencies> | ||
|
||
<profiles> | ||
<profile> | ||
<id>binary-packaging</id> | ||
<build> | ||
<plugins> | ||
<plugin> | ||
<artifactId>maven-dependency-plugin</artifactId> | ||
<executions> | ||
<execution> | ||
<phase>package</phase> | ||
<goals> | ||
<goal>copy-dependencies</goal> | ||
</goals> | ||
<configuration> | ||
<outputDirectory>${project.build.directory}</outputDirectory> | ||
<!-- compile scope gives runtime and compile dependencies (skips test deps) --> | ||
<includeScope>runtime</includeScope> | ||
</configuration> | ||
</execution> | ||
</executions> | ||
</plugin> | ||
</plugins> | ||
</build> | ||
</profile> | ||
</profiles> | ||
</project> |
11 changes: 11 additions & 0 deletions
11
lib/gooddata/cloud_resources/datawarehouse/datawarehouse_client.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# encoding: UTF-8 | ||
# frozen_string_literal: true | ||
# | ||
# Copyright (c) 2021 GoodData Corporation. All rights reserved. | ||
# This source code is licensed under the BSD-style license found in the | ||
# LICENSE file in the root directory of this source tree. | ||
|
||
base = Pathname(__FILE__).dirname.expand_path | ||
Dir.glob(base + 'drivers/*.jar').each do |file| | ||
require file unless file.start_with?('lcm-datawarehouse-driver') | ||
end |
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters