Skip to content
Merged
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
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.3.1
3.4.8
6 changes: 3 additions & 3 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
ruby 3.3.1
yarn 1.22.19
nodejs 16.15.0
ruby 3.4.8
yarn 1.22.22
nodejs 24.11.1
13 changes: 6 additions & 7 deletions Dockerfile.development
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# This is for development or CI only
FROM docker.io/ruby:3.3.1-alpine3.18 AS common
FROM docker.io/ruby:3.4.8-alpine3.23 AS common

RUN echo "@alpine/v3.16/main https://dl-cdn.alpinelinux.org/alpine/v3.16/main" >> /etc/apk/repositories \
&& apk update \
RUN apk update \
&& apk upgrade \
&& apk add \
build-base shared-mime-info mariadb-dev sqlite-dev tzdata imagemagick \
nodejs@alpine/v3.16/main yarn@alpine/v3.16/main \
vimdiff \
build-base shared-mime-info mariadb-dev sqlite-dev yaml-dev tzdata imagemagick \
nodejs yarn \
git vimdiff \
&& rm -rfv /var/cache/apk/*

# Diffs in red/green instead of blue/cyan
Expand Down Expand Up @@ -55,7 +54,7 @@ set -eu
ln -s /node_modules node_modules

bundle exec rake db:migrate
bundle exec rails server -b 0.0.0.0 -p 80
bundle exec rails server -b 0.0.0.0 -p 80 || true

echo "Rails exited, sleeping indefinitely so dev shells don't die."
sleep inf
Expand Down
10 changes: 4 additions & 6 deletions Dockerfile.production
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
FROM docker.io/ruby:3.3.1-alpine3.18 AS base
FROM docker.io/ruby:3.4.8-alpine3.23 AS base

RUN echo "@alpine/v3.16/main https://dl-cdn.alpinelinux.org/alpine/v3.16/main" >> /etc/apk/repositories \
&& apk update \
RUN apk update \
&& apk upgrade \
&& apk add \
build-base shared-mime-info mariadb-dev tzdata imagemagick \
jemalloc \
nodejs@alpine/v3.16/main yarn@alpine/v3.16/main \
build-base shared-mime-info mariadb-dev sqlite-dev yaml-dev tzdata imagemagick \
nodejs yarn \
&& rm -rfv /var/cache/apk/*

# These are equivalent to always setting --deployment, --path, and --without when relevant.
Expand Down
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ gem "byebug"
gem "httparty"

# windows support (linux timezone directory is used in the project)
gem "tzinfo-data", platforms: %i[mingw mswin x64_mingw]
gem "tzinfo-data", platforms: %i[windows]

# Sentry
gem "sentry-rails"
Expand Down
Loading