Skip to content
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

CONFIG: MSF-25952 Reverting delivery C9S with Java8 for LCM Bricks #1955

Closed
wants to merge 3 commits into from
Closed

CONFIG: MSF-25952 Reverting delivery C9S with Java8 for LCM Bricks #1955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
13787e1
Revert "BUGFIX: MSF-25904 Using C9S and java 8 for LCM Bricks"
hung-nguyen-hoang Dec 5, 2023
e3ff42a
Revert "MSF-25372: Upgrade lcm-bricks image to C9S"
hung-nguyen-hoang Dec 5, 2023
6ebfd2b
CONFIG: MSF-25952 Bump version to deliver reverting C9S with Java8 fo…
hung-nguyen-hoang Dec 5, 2023
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
12 changes: 3 additions & 9 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-8-jdk-centos9:202311071405.4d8c665
FROM 020413372491.dkr.ecr.us-east-1.amazonaws.com/tools/gdc-java-8-jre-centos8:202308081603.4a43db3

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-8-jre-centos8:202308081603.4a43db3"

# which is required by RVM
RUN yum install -y which patch make git maven procps \
RUN yum install -y curl which patch make git maven procps \
&& yum clean all \
&& rm -rf /var/cache/yum

Expand All @@ -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 \
Expand Down Expand Up @@ -80,9 +77,6 @@ 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
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.63
3.7.64
4 changes: 2 additions & 2 deletions gooddata.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ Gem::Specification.new do |s|

s.add_development_dependency 'sqlite3' if RUBY_PLATFORM != 'java'

if RUBY_VERSION >= '2.5'
s.add_dependency 'activesupport', '< 7.0.0'
if RUBY_VERSION >= '2.5'
s.add_dependency 'activesupport', '< 7.0.0'
else
s.add_dependency 'activesupport', '>= 5.2.4.3', '< 6.0'
end
Expand Down