From f9f013c6281b46d61374d8445e4eabe1860493d5 Mon Sep 17 00:00:00 2001 From: Eugene Burmakin Date: Fri, 7 Nov 2025 12:45:28 +0100 Subject: [PATCH] Remove development-specific logic from Dockerfile --- docker/Dockerfile | 48 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 774129a1..9b42a8d4 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,14 +9,6 @@ ENV RAILS_LOG_TO_STDOUT=true ENV RAILS_PORT=3000 ENV RAILS_ENV=${RAILS_ENV} -# Development-specific environment variables -RUN if [ "$RAILS_ENV" = "development" ]; then \ - echo "export SELF_HOSTED=true" >> /etc/profile.d/rails.sh && \ - echo "export SIDEKIQ_USERNAME=sidekiq" >> /etc/profile.d/rails.sh && \ - echo "export SIDEKIQ_PASSWORD=password" >> /etc/profile.d/rails.sh && \ - echo "export PGSSENCMODE=disable" >> /etc/profile.d/rails.sh; \ - fi - RUN apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get upgrade -y -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ @@ -41,18 +33,13 @@ RUN apt-get update -qq \ # Install Node.js with architecture-specific logic for development # For production/staging, use LTS version -RUN if [ "$RAILS_ENV" = "development" ]; then \ - ARCH=$(dpkg --print-architecture) && \ - if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \ - curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ - apt-get install -y nodejs; \ - else \ - apt-get update && \ - apt-get install -y nodejs npm; \ - fi; \ - else \ - curl -fsSL https://deb.nodesource.com/setup_lts.x | bash - && \ +RUN ARCH=$(dpkg --print-architecture) && \ + if [ "$ARCH" = "amd64" ] || [ "$ARCH" = "arm64" ] || [ "$ARCH" = "armhf" ]; then \ + curl -fsSL https://deb.nodesource.com/setup_22.x | bash - && \ apt-get install -y nodejs; \ + else \ + apt-get update && \ + apt-get install -y nodejs npm; \ fi && \ npm install -g yarn && \ rm -rf /var/lib/apt/lists/* @@ -77,27 +64,16 @@ WORKDIR $APP_PATH COPY ../Gemfile ../Gemfile.lock ../.ruby-version ../vendor ./ # Install gems based on environment -RUN bundle config set --local path 'vendor/bundle' \ - && if [ "$RAILS_ENV" = "production" ] || [ "$RAILS_ENV" = "staging" ]; then \ - bundle config set --local without 'development test' && \ - bundle install --jobs 4 --retry 3; \ - else \ - bundle install --jobs 4 --retry 3; \ - fi \ - && rm -rf vendor/bundle/ruby/3.4.0/cache/*.gem +RUN bundle config set --local path 'vendor/bundle' && \ + bundle config set --local without 'development test' && \ + bundle install --jobs 4 --retry 3 && \ + rm -rf vendor/bundle/ruby/3.4.0/cache/*.gem COPY ../. ./ # Precompile assets for production/staging -RUN if [ "$RAILS_ENV" = "production" ] || [ "$RAILS_ENV" = "staging" ]; then \ - SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile && \ - rm -rf node_modules tmp/cache; \ - fi - -# Create caching-dev.txt file for development -RUN if [ "$RAILS_ENV" = "development" ]; then \ - mkdir -p $APP_PATH/tmp && touch $APP_PATH/tmp/caching-dev.txt; \ - fi +RUN SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile && \ + rm -rf node_modules tmp/cache COPY ./docker/web-entrypoint.sh /usr/local/bin/web-entrypoint.sh RUN chmod +x /usr/local/bin/web-entrypoint.sh