Merge pull request #427 from internetee/add-dockerfile

Updated dockerfile and renovate.json

Author: vohmar

.dockerignore

@@ -0,0 +1,53 @@
+# Git
+.git
+.gitignore
+.github
+
+# Docker
+Dockerfile
+Dockerfile.*
+docker-compose.yml
+.dockerignore
+
+# Rails
+.bundle
+log/*
+tmp/*
+storage/*
+public/assets
+public/packs
+node_modules
+yarn-error.log
+
+# Environment
+.env
+.env.*
+config/master.key
+config/credentials.yml.enc
+
+# Documentation
+README.md
+CHANGELOG.md
+LICENSE
+*.md
+
+# Development and test files
+spec/
+test/
+features/
+coverage/
+.rspec
+.rubocop.yml
+.ruby-version
+.byebug_history
+
+# OS specific
+.DS_Store
+Thumbs.db
+
+# Editor directories and files
+.idea
+.vscode
+*.swp
+*.swo
+*~

Dockerfile.production

@@ -0,0 +1,53 @@
+# Base image with platform specification
+FROM internetee/ruby:3.0-buster
+
+# Set working directory
+WORKDIR /opt/webapps/app
+
+# Set production environment
+ENV RAILS_ENV="production" \
+    RAILS_LOG_TO_STDOUT=true \
+    BUNDLE_DEPLOYMENT="1" \
+    BUNDLE_PATH="/usr/local/bundle" \
+    LANG=et_EE.UTF-8 \
+    LANGUAGE=et_EE:et \
+    LC_ALL=et_EE.UTF-8
+
+# Fix repository issues and install packages
+RUN apt-get update -qq || true && \
+    apt-get install -y --no-install-recommends gnupg2 && \
+    # Remove problematic repositories
+    rm -f /etc/apt/sources.list.d/google-chrome.list && \
+    rm -f /etc/apt/sources.list.d/pgdg.list && \
+    # Update sources and install packages
+    apt-get update -qq && \
+    apt-get install --no-install-recommends -y \
+    netcat \
+    curl \
+    libpq-dev \
+    imagemagick \
+    shared-mime-info \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/*
+
+# Copy Gemfile and install dependencies
+COPY Gemfile Gemfile.lock ./
+RUN bundle config set --local without 'development test' && \
+    bundle install --jobs 20 --retry 5 && \
+    bundle clean --force
+
+# Copy application code
+COPY . .
+
+# Precompile assets
+RUN RAILS_ENV=production bundle exec rake assets:precompile
+
+# Expose Rails port
+EXPOSE 3000
+
+# Health check for Rails
+# HEALTHCHECK --interval=30s --timeout=3s \
+#   CMD curl -f http://localhost:3000/health || exit 1
+
+# Start the Rails server
+CMD ["bundle", "exec", "rails", "server", "-b", "0.0.0.0"]

renovate.json

@@ -14,7 +14,8 @@
     },
     {
       "matchDepTypes": [".ruby-version"],
-      "addLabels": ["ruby-version"]
+      "addLabels": ["ruby-version"],
+      "automerge": false
     }
   ],
   "docker": {

test/integration/whois_records/json_test.rb

@@ -125,7 +125,7 @@ def test_hide_sensitive_data_of_legal_entity_when_captcha_is_unsolved
     response_json = JSON.parse(response.body, symbolize_names: true)
 
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:email]
-    assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:phone]
+    assert_equal 'Not Disclosed', response_json[:phone]
 
     expected_admin_contacts = [
       { name: 'Not Disclosed - Visit www.internet.ee for web-based WHOIS',
@@ -233,7 +233,7 @@ def test_hide_sensitive_data_of_legal_entity_when_ip_is_not_in_whitelist
     response_json = JSON.parse(response.body, symbolize_names: true)
 
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:email]
-    assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS', response_json[:phone]
+    assert_equal 'Not Disclosed', response_json[:phone]
     assert_equal 'Not Disclosed - Visit www.internet.ee for web-based WHOIS',
                  response_json[:registrant_changed]