Merge pull request #917 from uktrade/develop

Release
uktrade · Apr 30, 2024 · e684456 · e684456
2 parents 211e3e8 + 34844a8
commit e684456
Show file tree

Hide file tree

Showing 19 changed files with 53 additions and 17 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -40,12 +40,12 @@ jobs:
           DL_API_KEY: $DL_API_KEY
           TRANSLATE_OPPORTUNITIES: true
           OPENSSL_CONF: /dev/null
-      - image: cimg/postgres:13.9
+      - image: cimg/postgres:16.2
         environment:
           POSTGRES_USER: user
           POSTGRES_DB:  circle_test
           POSTGRES_PASSWORD: $POSTGRES_PASSWORD
-      - image: cimg/redis:6.2.10
+      - image: cimg/redis:7.2.4
         environment:
           REDIS_URL: "redis://localhost:6379/"
       - image: docker.elastic.co/elasticsearch/elasticsearch:7.9.3

diff --git a/.gitignore b/.gitignore
@@ -91,4 +91,7 @@ output.png
 .rspec
 
 # Test file
-test_clean_file
+test_clean_file
+
+#Docker config file
+Dockerfile.dev 
diff --git a/Dockerfile.dev b/Dockerfile.dev
@@ -0,0 +1,28 @@
+### 1. Pull offical Python
+FROM ruby:3.2.2
+
+### 2. Add Environment variables
+ENV DOCKERIZE_VERSION v0.6.1
+ENV BUNDLER_VERSION=2.1.4
+
+### 3. Create working directory
+RUN mkdir /app
+WORKDIR /app
+
+### 4. Install dependancies
+RUN apt-get update -qq && apt-get install -y nodejs postgresql-client wget
+
+### 5. Add dockerize to allow waiting for the DB to load.
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+### 6. Copy project to container
+COPY . /app/
+
+### 7. Install dependancies
+RUN bundle install
+
+### 8. Configure the main process to run when running the image
+CMD ["rails", "server", "-b", "0.0.0.0"]
+
diff --git a/Gemfile b/Gemfile
@@ -10,7 +10,7 @@ gem 'pg', '1.5.4'
 gem 'sidekiq', '7.1.3'
 gem 'sidekiq-cron', '1.9.1'
 gem 'sidekiq-failures', '1.0.1'
-gem 'redis', '4.8.1'
+gem 'redis', '5.2.0'
 gem 'redis-namespace', '1.10.0'
 gem 'faraday', '1.0.1'
 gem 'figaro'
@@ -110,7 +110,7 @@ end
 
 group :development do
   gem 'web-console'
-  gem 'rubocop', '~> 0.77.0', require: false
+  gem 'rubocop', '~> 1.0.0', require: false
   gem 'rubocop-faker'
   gem 'listen'
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1582,7 +1582,6 @@ GEM
       concurrent-ruby (~> 1.0)
     immutable-struct (2.4.1)
     interception (0.5)
-    jaro_winkler (1.5.4)
     jbuilder (2.11.5)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
@@ -1672,9 +1671,10 @@ GEM
     paper_trail (12.3.0)
       activerecord (>= 5.2)
       request_store (~> 1.1)
-    parallel (1.23.0)
-    parser (3.2.2.1)
+    parallel (1.24.0)
+    parser (3.3.1.0)
       ast (~> 2.4.1)
+      racc
     pg (1.5.4)
     pg_search (2.3.6)
       activerecord (>= 5.2)
@@ -1759,8 +1759,9 @@ GEM
       ffi (~> 1.0)
     rdoc (6.6.3.1)
       psych (>= 4.0.0)
-    redis (4.8.1)
-    redis-client (0.17.0)
+    redis (5.2.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.22.1)
       connection_pool
     redis-namespace (1.10.0)
       redis (>= 4)
@@ -1800,13 +1801,17 @@ GEM
     rspec-support (3.12.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
-    rubocop (0.77.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.0.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.1.5)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8)
+      rexml
+      rubocop-ast (>= 0.6.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
+      unicode-display_width (>= 1.4.0, < 2.0)
+    rubocop-ast (1.31.2)
+      parser (>= 3.3.0.4)
     rubocop-faker (1.0.0)
       rubocop (>= 0.74)
     rubocop-rspec (1.41.0)
@@ -1887,7 +1892,7 @@ GEM
       unf_ext
     unf_ext (0.0.8.2)
     unicode (0.4.4.4)
-    unicode-display_width (1.6.1)
+    unicode-display_width (1.8.0)
     uniform_notifier (1.16.0)
     vcr (6.1.0)
     warden (1.2.9)
@@ -1976,15 +1981,15 @@ DEPENDENCIES
   pundit-matchers
   rails (= 6.1.7.7)
   rails-controller-testing
-  redis (= 4.8.1)
+  redis (= 5.2.0)
   redis-namespace (= 1.10.0)
   rest-client
   rspec-collection_matchers
   rspec-mocks
   rspec-rails
   rspec-sidekiq
   rspec_junit_formatter
-  rubocop (~> 0.77.0)
+  rubocop (~> 1.0.0)
   rubocop-faker
   rubocop-rspec
   rubyzip (~> 1.3.0)

diff --git a/vendor/cache/jaro_winkler-1.5.4.gem b/vendor/cache/jaro_winkler-1.5.4.gem
diff --git a/vendor/cache/parallel-1.23.0.gem b/vendor/cache/parallel-1.23.0.gem
diff --git a/vendor/cache/parallel-1.24.0.gem b/vendor/cache/parallel-1.24.0.gem
diff --git a/vendor/cache/parser-3.2.2.1.gem b/vendor/cache/parser-3.2.2.1.gem
diff --git a/vendor/cache/parser-3.3.1.0.gem b/vendor/cache/parser-3.3.1.0.gem
diff --git a/vendor/cache/redis-4.8.1.gem b/vendor/cache/redis-4.8.1.gem
diff --git a/vendor/cache/redis-5.2.0.gem b/vendor/cache/redis-5.2.0.gem
diff --git a/vendor/cache/redis-client-0.17.0.gem b/vendor/cache/redis-client-0.17.0.gem
diff --git a/vendor/cache/redis-client-0.22.1.gem b/vendor/cache/redis-client-0.22.1.gem
diff --git a/vendor/cache/rubocop-0.77.0.gem b/vendor/cache/rubocop-0.77.0.gem
diff --git a/vendor/cache/rubocop-1.0.0.gem b/vendor/cache/rubocop-1.0.0.gem
diff --git a/vendor/cache/rubocop-ast-1.31.2.gem b/vendor/cache/rubocop-ast-1.31.2.gem
diff --git a/vendor/cache/unicode-display_width-1.6.1.gem b/vendor/cache/unicode-display_width-1.6.1.gem
diff --git a/vendor/cache/unicode-display_width-1.8.0.gem b/vendor/cache/unicode-display_width-1.8.0.gem