change compose.yml to RAILS_MASTER_KEY

Author: rubys

lib/generators/templates/docker-compose.yml.erb

@@ -40,7 +40,7 @@ services:
 <% end -%>
 <% end -%>
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 <% if using_redis? or deploy_database != 'sqlite3' -%>
     depends_on:
@@ -135,5 +135,5 @@ secrets:
 <% end -%>
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/api/docker-compose.yml

@@ -14,9 +14,9 @@ services:
       - "3000:3000"
     environment:
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/bun/docker-compose.yml

@@ -14,9 +14,9 @@ services:
       - "3000:3000"
     environment:
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/esbuild/docker-compose.yml

@@ -14,9 +14,9 @@ services:
       - "3000:3000"
     environment:
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/mysql/docker-compose.yml

@@ -15,7 +15,7 @@ services:
     environment:
       - DATABASE_URL=mysql2://root:password@mysql-db/
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
     depends_on:
       mysql-db:
@@ -36,5 +36,5 @@ services:
       retries: 30
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/postgresql/Dockerfile

@@ -2,44 +2,40 @@
 # check=error=true
 
 # This Dockerfile is designed for production, not development. Use with Kamal or build'n'run by hand:
-# docker build -t demo .
-# docker run -d -p 80:80 -e RAILS_MASTER_KEY=<value from config/master.key> --name demo demo
+# docker build -t test_postgresql .
+# docker run -d -p 80:80 -e RAILS_MASTER_KEY=<value from config/master.key> --name test_postgresql test_postgresql
 
 # For a containerized dev environment, see Dev Containers: https://guides.rubyonrails.org/getting_started_with_devcontainer.html
 
 # Make sure RUBY_VERSION matches the Ruby version in .ruby-version
 ARG RUBY_VERSION=xxx
-FROM ruby:$RUBY_VERSION-slim AS base
+FROM docker.io/library/ruby:$RUBY_VERSION-slim AS base
 
 # Rails app lives here
 WORKDIR /rails
 
-# Update gems and bundler
-RUN gem update --system --no-document && \
-    gem install -N bundler
-
 # Install base packages
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y curl libjemalloc2 postgresql-client && \
+    apt-get install --no-install-recommends -y curl libjemalloc2 libvips postgresql-client && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Set production environment
-ENV BUNDLE_DEPLOYMENT="1" \
+ENV RAILS_ENV="production" \
+    BUNDLE_DEPLOYMENT="1" \
     BUNDLE_PATH="/usr/local/bundle" \
-    BUNDLE_WITHOUT="development:test" \
-    RAILS_ENV="production"
-
+    BUNDLE_WITHOUT="development"
 
 # Throw-away build stage to reduce size of final image
 FROM base AS build
 
 # Install packages needed to build gems
 RUN apt-get update -qq && \
-    apt-get install --no-install-recommends -y build-essential libpq-dev libyaml-dev && \
+    apt-get install --no-install-recommends -y build-essential git libpq-dev libyaml-dev pkg-config && \
     rm -rf /var/lib/apt/lists /var/cache/apt/archives
 
 # Install application gems
-COPY Gemfile Gemfile.lock ./
+COPY Gemfile Gemfile.lock vendor ./
+
 RUN bundle install && \
     rm -rf ~/.bundle/ "${BUNDLE_PATH}"/ruby/*/cache "${BUNDLE_PATH}"/ruby/*/bundler/gems/*/.git && \
     bundle exec bootsnap precompile --gemfile
@@ -54,21 +50,20 @@ RUN bundle exec bootsnap precompile app/ lib/
 RUN SECRET_KEY_BASE_DUMMY=1 ./bin/rails assets:precompile
 
 
+
+
 # Final stage for app image
 FROM base
 
-
 # Copy built artifacts: gems, application
 COPY --from=build "${BUNDLE_PATH}" "${BUNDLE_PATH}"
 COPY --from=build /rails /rails
 
 # Run and own only the runtime files as a non-root user for security
-ARG UID=xxx \
-    GID=1000
-RUN groupadd -f -g $GID rails && \
-    useradd -u $UID -g $GID rails --create-home --shell /bin/bash && \
+RUN groupadd --system --gid 1000 rails && \
+    useradd rails --uid 1000 --gid 1000 --create-home --shell /bin/bash && \
     chown -R rails:rails db log storage tmp
-USER rails:rails
+USER 1000:1000
 
 # Entrypoint prepares the database.
 ENTRYPOINT ["/rails/bin/docker-entrypoint"]

test/results/private_gemserver/docker-compose.yml

@@ -16,13 +16,13 @@ services:
       - "3000:3000"
     environment:
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 
 secrets:
   gemserver_credentials:
     file: ./GEMSERVER_CREDENTIALS.secret.txt
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/private_gemserver_with_cache/docker-compose.yml

@@ -16,13 +16,13 @@ services:
       - "3000:3000"
     environment:
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
 
 secrets:
   gemserver_credentials:
     file: ./GEMSERVER_CREDENTIALS.secret.txt
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/redis/docker-compose.yml

@@ -15,7 +15,7 @@ services:
     environment:
       - REDIS_URL=redis://redis-db:6379
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
     depends_on:
       redis-db:
@@ -25,5 +25,5 @@ services:
     image: redis
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key

test/results/sidekiq/docker-compose.yml

@@ -16,7 +16,7 @@ services:
       - REDIS_URL=redis://redis-db:6379
       - DATABASE_URL=postgres://root:password@postgres-db/
     secrets:
-      - source: master_key
+      - source: RAILS_MASTER_KEY
         target: /rails/config/master.key
     depends_on:
       redis-db:
@@ -54,5 +54,5 @@ services:
         condition: service_healthy
 
 secrets:
-  master_key:
-    file: ./config/master.key
+  RAILS_MASTER_KEY
+    file: ./config/master.key