Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 11 additions & 11 deletions docker/etna-base-dev/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
FROM development-certs

FROM ruby:2.7.6-bullseye
FROM ruby:4.0.1-trixie
WORKDIR /app

ENV DOCKER_VERSION 20.10.6
ENV RUBY_VERSION 2.7.6
ENV RUBY_MAJOR_VERSION 2.7.0
ENV RUBY_VERSION 4.0.1
ENV RUBY_MAJOR_VERSION 4.0.0
# This is so dumb -- but if BUNDLER_VERSION is set as an environment variable,
# it causes issues with bundler... bleck. So, so add an underscore at the end.
ENV BUNDLER_VERSION_ 2.3.15
ENV DOCKERIZE_VERSION 0.5.0
ENV BUNDLER_VERSION_ 4.0.7
ENV DOCKERIZE_VERSION 0.10.1
ENV NODE_VERSION 14.17.1
ENV DOCKERIZE_URL https://github.com/jwilder/dockerize/releases/download/v${DOCKERIZE_VERSION}/dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
ENV RACK_ENV development
Expand All @@ -25,13 +25,15 @@ COPY --from=0 /certs/rootCA.pem /usr/local/share/ca-certificates/devRoot.crt
RUN chmod 644 /usr/local/share/ca-certificates/devRoot.crt && update-ca-certificates

# add postgres 10 repo for debian bionic
RUN echo "deb http://apt.postgresql.org/pub/repos/apt/ bullseye-pgdg main" >> /etc/apt/sources.list.d/pgdg.list
RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add -
RUN echo "deb [signed-by=/etc/apt/keyrings/pgdg.gpg] http://apt.postgresql.org/pub/repos/apt/ trixie-pgdg main" >> /etc/apt/sources.list.d/pgdg.list
RUN curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | gpg --no-default-keyring --keyring ./temp-keyring.gpg --import -
RUN gpg --no-default-keyring --keyring ./temp-keyring.gpg --export --output /etc/apt/keyrings/pgdg.gpg
RUN rm ./temp-keyring.gpg

RUN apt-get update \
&& apt-get install -y \
curl \
libopenblas-base \
libopenblas0 \
libcurl4-openssl-dev \
libssl-dev \
parallel \
Expand All @@ -49,10 +51,8 @@ RUN curl https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x6

RUN curl -o /tmp/dockerize.tgz -L $DOCKERIZE_URL && ( cd /usr/bin && tar xzf /tmp/dockerize.tgz )

RUN rm /usr/local/lib/ruby/gems/2.7.0/specifications/default/bundler-*.gemspec
#RUN rm /usr/local/lib/ruby/gems/2.7.0/specifications/default/bundler-*.gemspec
RUN gem install bundler --default -v "=$BUNDLER_VERSION_"
## !! Note the rubygems version locked down here is meant to just be a temporary fix and should be removed when we do update Ruby !!
RUN gem update --system 3.4.22

# We also the GEM_PATH to be this BUNDLE_PATH so that ides (Rubymine) will find gems easier.
ENV GEM_HOME="$BUNDLE_PATH"
Expand Down
12 changes: 10 additions & 2 deletions etna/Gemfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
source "http://rubygems.org"

ruby "~> 2.7"
ruby "~> 4.0"

gem 'mini_magick'
gem 'matrix'
gem 'daru'
gem 'rltk'
gem 'filigree', '0.3.3'
Expand Down Expand Up @@ -43,7 +44,6 @@ gem "json_schemer"
group :test do
gem 'rspec'
gem 'rack-test', require: "rack/test"
gem "pry", "~>0.13.0"
gem "pry-byebug"
gem "timecop"
gem "webmock"
Expand All @@ -53,3 +53,11 @@ group :test do
gem 'database_cleaner', '1.8.5'
gem 'net-http-persistent'
end

gem "ostruct", "~> 0.6.3"

gem "net-smtp", "~> 0.5.1"

gem "csv", "~> 3.3"

gem "pry", "= 0.14.2"
Loading
Loading