Skip to content

revert(lcm): Revert Redshift JDBC 2.2.9 and CentOS base image #2117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
milandufek wants to merge 1 commit into from
Closed

revert(lcm): Revert Redshift JDBC 2.2.9 and CentOS base image #2117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Dockerfile
View file
Open in desktop
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-11-jre-centos9:202607101511.b527cf7b
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44

ARG RVM_VERSION=stable
ARG JRUBY_VERSION=9.4.12.1

LABEL image_name="GDC LCM Bricks"
LABEL maintainer="LCM <lcm@gooddata.com>"
LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44"

# which is required by RVM
RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip \
RUN yum install -y gcc gcc-c++ which patch make unzip gnupg git maven procps gzip gawk bzip2 \
&& yum clean all \
&& rm -rf /var/cache/yum

Expand Down
6 changes: 3 additions & 3 deletions DockerfileOldImage
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44

ARG RVM_VERSION=stable

Expand All @@ -8,10 +8,10 @@ ARG JRUBY_VERSION=9.2.20.0
LABEL image_name="GDC LCM Bricks"
LABEL maintainer="LCM <lcm@gooddata.com>"
LABEL git_repository_url="https://github.com/gooddata/gooddata-ruby/"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202607101511.b527cf7b"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre:202609300803.5ae07065-f44"

# which is required by RVM
RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make git maven procps \
RUN yum install -y gcc gcc-c++ diffutils curl-minimal which patch make gnupg git maven procps gawk bzip2 \
&& yum clean all \
&& rm -rf /var/cache/yum

Expand Down
2 changes: 1 addition & 1 deletion VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.7.109
3.7.110
34 changes: 11 additions & 23 deletions ci/redshift/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,35 +11,23 @@
<dependencies>
<dependency>
<groupId>com.amazon.redshift</groupId>
<artifactId>redshift-jdbc42</artifactId>
<version>2.2.9</version>
<artifactId>redshift-jdbc42-no-awssdk</artifactId>
<version>1.2.36.1060</version>
</dependency>
<!-- AWS SDK v2 is an optional dependency of redshift-jdbc42 2.x, required for IAM authentication -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>auth</artifactId>
<version>2.31.2</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-core</artifactId>
<version>1.11.633</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>redshift</artifactId>
<version>2.31.2</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-redshift</artifactId>
<version>1.11.633</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>redshiftserverless</artifactId>
<version>2.31.2</version>
</dependency>
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>sts</artifactId>
<version>2.31.2</version>
</dependency>
<!-- Used by redshift-jdbc42 2.x IAM authentication but not declared in its pom -->
<dependency>
<groupId>com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>2.16.0</version>
<groupId>com.amazonaws</groupId>
<artifactId>aws-java-sdk-sts</artifactId>
<version>1.11.633</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
Expand Down
Loading