Skip to content

Commit

Permalink
Merge pull request #1952 from hung-nguyen-hoang/MSF-25904-C9S-Java8
Browse files Browse the repository at this point in the history
BUGFIX: MSF-25904 Using C9S and java 8 for LCM Bricks

Reviewed-by: https://github.com/tqtu
  • Loading branch information
gdgate authored Nov 16, 2023
2 parents 2931de7 + 73d8ce1 commit bef0553
Showing 1 changed file with 8 additions and 2 deletions.
10 changes: 8 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-11-jre-centos9:202310031054.5119496
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665

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-11-jre-centos9:202310031054.5119496"
LABEL parent_image="020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jdk-centos9:202311071405.4d8c665"

# which is required by RVM
RUN yum install -y which patch make git maven procps \
Expand All @@ -33,6 +33,9 @@ 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 \
Expand Down Expand Up @@ -77,6 +80,9 @@ RUN cp -rf ci/mysql/target/*.jar ./lib/gooddata/cloud_resources/mysql/drivers/

RUN bundle install

# 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)

ARG GIT_COMMIT=unspecified
ARG BRICKS_VERSION=unspecified
LABEL git_commit=$GIT_COMMIT
Expand Down

0 comments on commit bef0553

Please sign in to comment.