mirror of
https://github.com/postalserver/postal.git
synced 2026-10-18 18:26:06 +00:00
Adam Cooke
5eeed7c023
Upgrades Rails from 7.1.6 to 7.2.3.2, Ruby from 3.4.6 to 3.4.10, and brings the rest of the bundle up to date. Two things were broken by Rails 7.2 and are fixed here: * MigrationWaiter called `ActiveRecord::Base.connection.migration_context`, which moved to the connection pool in 7.2. This raised NoMethodError on boot for any deployment with `migration_waiter.enabled` set, and had no test covering it. * `config.action_dispatch.show_exceptions = false` was deprecated in 7.1 and removed in 7.2. Now `:none`. `json` is pinned to < 3. Active Support 7.2 passes `quirks_mode:` to both `JSON.generate` and `JSON.parse`, and json 3.0 removed that option, so an unpinned json resolves to 3.x and makes every `to_json` raise - webhook payloads included. Nothing else in the bundle constrains it. The pin can go when we reach Rails 8.1, which no longer passes the option. `dynamic_form` is dropped. It is unmaintained and from 1.3.1 requires Ruby < 3.4, so it could never be updated again. Ten views used it, so `error_messages_for` now lives in ErrorMessagesHelper and `f.error_messages` in a form builder extension. The rendered markup is unchanged apart from a heading and description the stylesheet had always hidden; the rules that hid them are removed too. `execjs` is unpinned. The `< 2.8` constraint dated from the Rails 6.0 upgrade and asset output is byte-identical without it. Notable gem majors: puma 8, haml 7, secure_headers 7, sentry 7, jwt 3, prometheus-client 5, highline 3, omniauth-rails_csrf_protection 2, rspec-rails 8, shoulda-matchers 8, rubocop 1.91. secure_headers 7 changes X-XSS-Protection from "1; mode=block" to "0", which is the correct modern default and matches Rails' own. `config.load_defaults` deliberately stays at 7.0. The pending 7.1 and 7.2 options are listed, commented out, in new_framework_defaults_7_1.rb and _7_2.rb so they can be adopted in stages - several change the signed cookie and cache formats and need a staged deploy. The vestigial new_framework_defaults_7_0.rb is removed, as `load_defaults 7.0` already applies all of it. Adds tests for the areas this touched, which were mostly uncovered: MigrationWaiter, the serialized columns that gate a defaults bump, JSON encoding, HAML template compilation for all 103 templates, page rendering, form error rendering and security headers. The assets Gemfile group now includes :test so the view layer can be exercised at all.
69 lines
1.8 KiB
Docker
69 lines
1.8 KiB
Docker
FROM ruby:3.4.10-slim-bookworm AS base
|
|
|
|
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
|
|
RUN apt-get update \
|
|
&& apt-get install --no-install-recommends -y curl \
|
|
&& apt-get clean \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
RUN (curl -sL https://deb.nodesource.com/setup_20.x | bash -)
|
|
|
|
# Install main dependencies
|
|
RUN apt-get update && \
|
|
apt-get install -y --no-install-recommends \
|
|
build-essential \
|
|
netcat-openbsd \
|
|
libmariadb-dev \
|
|
libcap2-bin \
|
|
nano \
|
|
libyaml-dev \
|
|
nodejs \
|
|
&& apt-get clean \
|
|
&& rm -rf /var/lib/apt/lists/*
|
|
|
|
RUN setcap 'cap_net_bind_service=+ep' /usr/local/bin/ruby
|
|
|
|
# Configure 'postal' to work everywhere (when the binary exists
|
|
# later in this process)
|
|
ENV PATH="/opt/postal/app/bin:${PATH}"
|
|
|
|
# Setup an application
|
|
RUN useradd -r -d /opt/postal -m -s /bin/bash -u 999 postal
|
|
USER postal
|
|
RUN mkdir -p /opt/postal/app /opt/postal/config
|
|
WORKDIR /opt/postal/app
|
|
|
|
# Install bundler
|
|
RUN gem install bundler -v 2.7.2 --no-doc
|
|
|
|
# Install the latest and active gem dependencies and re-run
|
|
# the appropriate commands to handle installs.
|
|
COPY --chown=postal Gemfile Gemfile.lock ./
|
|
RUN bundle install
|
|
|
|
# Copy the application (and set permissions)
|
|
COPY ./docker/wait-for.sh /docker-entrypoint.sh
|
|
COPY --chown=postal . .
|
|
|
|
# Export the version
|
|
ARG VERSION
|
|
ARG BRANCH
|
|
RUN if [ "$VERSION" != "" ]; then echo $VERSION > VERSION; fi \
|
|
&& if [ "$BRANCH" != "" ]; then echo $BRANCH > BRANCH; fi
|
|
|
|
# Set paths for when running in a container
|
|
ENV POSTAL_CONFIG_FILE_PATH=/config/postal.yml
|
|
|
|
# Set the CMD
|
|
ENTRYPOINT [ "/docker-entrypoint.sh" ]
|
|
CMD ["postal"]
|
|
|
|
# ci target - use --target=ci to skip asset compilation
|
|
FROM base AS ci
|
|
|
|
# full target - default if no --target option is given
|
|
FROM base AS full
|
|
|
|
RUN RAILS_GROUPS=assets bundle exec rake assets:precompile
|
|
RUN touch /opt/postal/app/public/assets/.prebuilt
|