Skip to content

Commit

Permalink
Merge pull request #594 from CDLUC3/v5.16-rc2
Browse files Browse the repository at this point in the history
V5.16 rc2
  • Loading branch information
briri committed May 22, 2024
2 parents 60579ee + d4cfb29 commit f1a91b9
Show file tree
Hide file tree
Showing 11 changed files with 1,274 additions and 1,525 deletions.
14 changes: 7 additions & 7 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
FROM ruby:3.0.4
FROM ruby:3.2-slim-bookworm

RUN groupadd -g 1000 dmpt && useradd -u 1000 -g 1000 dmpt


# Install packages needed to run your application (not build deps):
# We need to recreate the /usr/share/man/man{1..8} directories first because
# they were clobbered by a parent image.
Expand All @@ -12,12 +11,15 @@ RUN set -ex \
mtr \
autoconf \
automake \
build-essential \
gawk \
g++ \
git \
curl \
imagemagick \
libffi-dev \
libgdbm-dev \
libmariadb-dev \
libreadline-dev \
libssl-dev \
libtool \
Expand All @@ -28,9 +30,8 @@ RUN set -ex \
&& apt-get update && apt-get install -y --no-install-recommends $RUN_DEPS \
&& rm -rf /var/lib/apt/lists/*


# Install nodejs
RUN curl -sL https://deb.nodesource.com/setup_18.x | bash -
RUN curl -sL https://deb.nodesource.com/setup_20.x | bash -
RUN apt-get install -y nodejs

# Install yarn
Expand All @@ -50,10 +51,9 @@ WORKDIR $INSTALL_PATH
ENV RAILS_ENV development
RUN rm -rf node_modules vendor

RUN gem install bundler -v 2.4
RUN gem install rails
RUN gem install bundler -v 2.5
RUN gem install foreman

RUN bundle config without pgsql rollbar
RUN bundle install
RUN yarn install

Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ gem 'rollbar', group: :rollbar, require: false

# A simple, fast Mysql library for Ruby, binding to libmysql
# (http://github.com/brianmario/mysql2)
gem 'mysql2', '0.5.5', group: :mysql, require: false
gem 'mysql2', group: :mysql, require: false

# Pg is the Ruby interface to the {PostgreSQL
# RDBMS}[http://www.postgresql.org/](https://bitbucket.org/ged/ruby-pg)
Expand Down
Loading

0 comments on commit f1a91b9

Please sign in to comment.