Breaks docker config for fly setup.

.dockerignore

@@ -1,19 +1,39 @@
-.git
-.dockerignore
-.byebug_history
-.env*
-.gitignore
-.dockerignore
-.github/*
-Brewfile
-Procfile*
-docker-compose.*
-Dockerfile
-log/*
-tmp/*
-coverage/*
-node_modules/*
-public/assets/*
-storage/*
-public/packs/*
-public/packs-test/*
+# See https://docs.docker.com/engine/reference/builder/#dockerignore-file for more about ignoring files.
+
+# Ignore git directory.
+/.git/
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore all default key files.
+/config/master.key
+/config/credentials/*.key
+
+# Ignore all environment files.
+/.env*
+!/.env.example
+
+# Ignore all logfiles and tempfiles.
+/log/*
+/tmp/*
+!/log/.keep
+!/tmp/.keep
+
+# Ignore pidfiles, but keep the directory.
+/tmp/pids/*
+!/tmp/pids/
+!/tmp/pids/.keep
+
+# Ignore storage (uploaded files in development and any SQLite databases).
+/storage/*
+!/storage/.keep
+/tmp/storage/*
+!/tmp/storage/
+!/tmp/storage/.keep
+
+# Ignore assets.
+/node_modules/
+/app/assets/builds/*
+!/app/assets/builds/.keep
+/public/assets

.gitignore

@@ -37,3 +37,4 @@ yarn-debug.log*
 
 # Test artifacts
 .artifacts
+.yarn

.node-version

@@ -0,0 +1 @@
+15.14.0

.nvmrc

@@ -1 +1 @@
-lts/erbium
+v15.14.0

.tool-versions

@@ -0,0 +1 @@
+postgres 14.7

Dockerfile

@@ -1,69 +1,96 @@
-ARG RUBY_VERSION
-FROM ruby:$RUBY_VERSION
-
-ARG PG_MAJOR
-ARG NODE_MAJOR
-ARG BUNDLER_VERSION
-ARG YARN_VERSION
-ARG RAILS_ENV
-
-ENV RAILS_ENV=${RAILS_ENV} \
-  SECRET_KEY_BASE=foo \
-  RAILS_SERVE_STATIC_FILES=true \
-  RAILS_LOG_TO_STDOUT=true
-
-WORKDIR /app
-
-# Add PostgreSQL to sources list
-RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
-  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
-
-# Add NodeJS to sources list
-RUN curl -sL https://deb.nodesource.com/setup_$NODE_MAJOR.x | bash -
-
-# Add Yarn to the sources list
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
-  && echo 'deb http://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list
-
-COPY .docker/Aptfile /tmp/Aptfile
-RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrade && \
-  DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
-    build-essential \
-    postgresql-client-$PG_MAJOR \
-    netcat \
-    nodejs \
-    yarn=$YARN_VERSION-1 \
-    $(cat /tmp/Aptfile | xargs) && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
-    truncate -s 0 /var/log/*log
-ENV NOKOGIRI_USE_SYSTEM_LIBRARIES 1
-
-# Configure bundler and PATH
-ENV LANG=C.UTF-8 \
-  BUNDLE_JOBS=4 \
-  BUNDLE_RETRY=3
-
-# Install gems
-ADD Gemfile* /app/
-RUN gem update --system && \
-    gem install bundler:$BUNDLER_VERSION
-
-RUN bundle config --global frozen 1 \
- && bundle install --binstubs -j4 --retry 3
-
-# Install yarn packages
-COPY package.json yarn.lock /app/
-RUN yarn install
-
-# Add the Rails app
-ADD . /app
-
-WORKDIR /app
+# syntax = docker/dockerfile:1
 
-EXPOSE 3000
+# Make sure RUBY_VERSION matches the Ruby version in .ruby-version and Gemfile
+ARG RUBY_VERSION=2.7.6
+FROM ruby:$RUBY_VERSION-slim as base
+
+# Rails app lives here
+WORKDIR /rails
+
+ARG DEPLOY_PACKAGES="postgresql-client file vim curl gzip libsqlite3-0 nodejs"
+
+# Set production environment
+ENV RAILS_ENV="production" \
+    BUNDLE_WITHOUT="development:test" \
+    BUNDLE_DEPLOYMENT="1"
+
+# Update gems and bundler
+RUN gem update --system --no-document && \
+    gem install -N bundler
+
+# Install packages needed to install nodejs
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y curl && \
+    rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# Install Node.js
+ARG NODE_VERSION=15.14.0
+ENV PATH=/usr/local/node/bin:$PATH
+RUN curl -sL https://github.com/nodenv/node-build/archive/master.tar.gz | tar xz -C /tmp/ && \
+    /tmp/node-build-master/bin/node-build "${NODE_VERSION}" /usr/local/node && \
+    rm -rf /tmp/node-build-master
+
+
+# Throw-away build stage to reduce size of final image
+FROM base as build
+
+# Install packages needed to build gems and node modules
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y build-essential libpq-dev libvips node-gyp pkg-config python-is-python3
+
+# Install yarn
+ARG YARN_VERSION=1.22.19
+RUN npm install -g yarn@$YARN_VERSION
+
+# Build options
+ENV PATH="/usr/local/node/bin:$PATH"
 
-RUN date -u > BUILD_TIME
+# Install application gems
+COPY --link Gemfile Gemfile.lock ./
+RUN bundle install && \
+    bundle exec bootsnap precompile --gemfile && \
+    rm -rf ~/.bundle/ $BUNDLE_PATH/ruby/*/cache $BUNDLE_PATH/ruby/*/bundler/gems/*/.git
 
-# Start up
-# CMD [".docker/startup.sh"]
+# Install node modules
+COPY --link package.json package-lock.json yarn.lock ./
+RUN yarn install --frozen-lockfile
+
+# Copy application code
+COPY --link . .
+
+# Precompile bootsnap code for faster boot times
+RUN bundle exec bootsnap precompile app/ lib/
+
+# Precompiling assets for production without requiring secret RAILS_MASTER_KEY
+RUN SECRET_KEY_BASE=DUMMY ./bin/rails assets:precompile
+
+
+# Final stage for app image
+FROM base
+
+# Install packages needed for deployment
+RUN apt-get update -qq && \
+    apt-get install --no-install-recommends -y imagemagick wget libvips postgresql-client sudo && \
+    rm -rf /var/lib/apt/lists /var/cache/apt/archives
+
+# Run and own the application files as a non-root user for security
+RUN useradd rails --home /rails --shell /bin/bash && \
+    sed -i 's/env_reset/env_keep="*"/' /etc/sudoers && \
+    chown rails:rails .
+USER rails:rails
+
+# Copy built artifacts: gems, application
+COPY --from=build /usr/local/bundle /usr/local/bundle
+COPY --from=build --chown=rails:rails /rails /rails
+
+# Deployment options
+ENV RAILS_LOG_TO_STDOUT="1" \
+    RAILS_SERVE_STATIC_FILES="true"
+
+# Entrypoint prepares the database.
+ENTRYPOINT ["/rails/bin/docker-entrypoint"]
+
+# Start the server by default, this can be overwritten at runtime
+EXPOSE 3000
+ENV DB_NAME=d91jklo2150n2i
+CMD ["./bin/rails", "server"]

Dockerfile.old

@@ -0,0 +1,70 @@
+ARG RUBY_VERSION
+# FROM ruby:$RUBY_VERSION
+FROM bitnami/ruby:2.7.6
+
+ARG PG_MAJOR
+ARG NODE_MAJOR
+ARG BUNDLER_VERSION
+ARG YARN_VERSION
+ARG RAILS_ENV
+
+ENV RAILS_ENV=${RAILS_ENV} \
+  SECRET_KEY_BASE=foo \
+  RAILS_SERVE_STATIC_FILES=true \
+  RAILS_LOG_TO_STDOUT=true
+
+WORKDIR /app
+
+# Add PostgreSQL to sources list
+RUN curl -sSL https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - \
+  && echo 'deb http://apt.postgresql.org/pub/repos/apt/ stretch-pgdg main' $PG_MAJOR > /etc/apt/sources.list.d/pgdg.list
+
+# Add NodeJS to sources list
+RUN curl -sL https://deb.nodesource.com/setup_$NODE_MAJOR.x | bash -
+
+# Add Yarn to the sources list
+RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+  && echo 'deb http://dl.yarnpkg.com/debian/ stable main' > /etc/apt/sources.list.d/yarn.list
+
+COPY .docker/Aptfile /tmp/Aptfile
+RUN apt-get update -qq && DEBIAN_FRONTEND=noninteractive apt-get -yq dist-upgrade && \
+  DEBIAN_FRONTEND=noninteractive apt-get install -yq --no-install-recommends \
+    build-essential \
+    postgresql-client-$PG_MAJOR \
+    netcat \
+    nodejs \
+    yarn=$YARN_VERSION-1 \
+    $(cat /tmp/Aptfile | xargs) && \
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* && \
+    truncate -s 0 /var/log/*log
+ENV NOKOGIRI_USE_SYSTEM_LIBRARIES 1
+
+# Configure bundler and PATH
+ENV LANG=C.UTF-8 \
+  BUNDLE_JOBS=4 \
+  BUNDLE_RETRY=3
+
+# Install gems
+ADD Gemfile* /app/
+RUN gem update --system && \
+    gem install bundler:$BUNDLER_VERSION
+
+RUN bundle config --global frozen 1 \
+ && bundle install --binstubs -j4 --retry 3
+
+# Install yarn packages
+COPY package.json yarn.lock /app/
+RUN yarn install
+
+# Add the Rails app
+ADD . /app
+
+WORKDIR /app
+
+EXPOSE 3000
+
+RUN date -u > BUILD_TIME
+
+# Start up
+# CMD [".docker/startup.sh"]

Gemfile

@@ -6,7 +6,7 @@ ruby "2.7.6"
 gem "bundler"
 gem "rails", "~> 6.1"
 gem "pg", "~> 1.2"
-gem "puma", "~> 5.0"
+gem "puma", "~> 5"
 gem "sassc-rails", "~> 2.1"
 gem "webpacker", "~> 5.1"
 gem "turbolinks", "~> 5"
@@ -81,7 +81,11 @@ end
 
 group :production do
   gem "bugsnag"
-  gem "scout_apm"
-  gem "newrelic_rpm"
+  # gem "scout_apm"
+  # gem "newrelic_rpm"
 end
 
+gem "dockerfile-rails", ">= 1.2", :group => :development
+gem "net-smtp", "~> 0.3.3", :require => false
+gem "net-imap", "~> 0.3.4", :require => false
+gem "net-pop", "~> 0.1.2", :require => false