Skip to content

Commit

Permalink
Revert "MSF-25372: Upgrade lcm-bricks image to C9S"
Browse files Browse the repository at this point in the history
This reverts commit 8604905
  • Loading branch information
hung-nguyen-hoang committed Dec 5, 2023
1 parent 13787e1 commit e3ff42a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
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:202310031054.5119496
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-11-jre-centos9:202310031054.5119496"
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 Down
4 changes: 2 additions & 2 deletions gooddata.gemspec
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', '>= 6.0.3.1'
else
s.add_dependency 'activesupport', '>= 5.2.4.3', '< 6.0'
end
Expand Down

0 comments on commit e3ff42a

Please sign in to comment.