Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
No results found
Show changes
Commits on Source (5)
Hide whitespace changes
Inline Side-by-side
CHANGELOG.md
View file @ 3720a3f8
......@@ -2,6 +2,15 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.3.4](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/compare/v1.3.3...v1.3.4) (2021-07-13)
### Bug Fixes
* hadolint suggestions ([2b6e36b](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/commit/2b6e36ba967f685f40a2126076119fc6e49aab45))
* invalid dockerfile changes ([851d312](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/commit/851d3128ea84b1550ace69c1446c792ba044435a))
* updated addressable and various other gems ([0e6ac62](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/commit/0e6ac62af2c7569b3b9bf4867ac65fe45ef71e90))
### [1.3.3](https://gitlab.nexdev.uk/pub/rails-base-image-builder/-/compare/v1.3.2...v1.3.3) (2021-05-20)
......
Dockerfile
View file @ 3720a3f8
......@@ -15,10 +15,8 @@ RUN apt-get update \
libpq-dev=11.* \
shared-mime-info=1.10-1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*
RUN adduser nexus --system --group -u 1000 && mkdir -p /app
RUN chown -R nexus:nexus /app
&& rm -rf /var/lib/apt/lists/* \
&& adduser nexus --system --group -u 1000 && mkdir -p /app && chown -R nexus:nexus /app
USER nexus
......
Gemfile
View file @ 3720a3f8
......@@ -17,13 +17,13 @@ gem 'mysql2', '0.5.3'
gem 'active_model_serializers', '0.10.12'
gem 'rqrcode_png', '0.1.5'
gem 'hcaptcha', '7.1.0'
gem 'faker', '2.17.0'
gem 'faker', '2.18.0'
gem 'bunny_events', '0.3.2'
gem 'bunny-mock', '1.7.0'
gem 'audited', '4.10.0'
gem 'discard', '1.2.0'
gem 'ddtrace', '0.46.0'
gem 'delayed_job_active_record', '4.1.5'
gem 'ddtrace', '0.51.0'
gem 'delayed_job_active_record', '4.1.6'
gem 'dotenv-rails', '2.7.6'
gem 'redis-rails', '5.0.2'
gem 'ruby-mailchecker', '4.0.7'
......@@ -44,7 +44,7 @@ gem 'webmock', '3.12.2'
gem 'web-console', '4.1.0'
gem 'spring-watcher-listen', '2.0.1'
gem 'aws-sdk-s3', '1.92.0'
gem 'jwt', '2.2.2'
gem 'jwt', '2.2.3'
gem 'sneakers', '2.12.0'
gem 'pundit', '2.1.0'
gem 'pundit-matchers', '1.6.0'
......
Gemfile.lock
View file @ 3720a3f8
......@@ -67,28 +67,28 @@ GEM
minitest (>= 5.1)
tzinfo (~> 2.0)
zeitwerk (~> 2.3)
addressable (2.7.0)
addressable (2.8.0)
public_suffix (>= 2.0.2, < 5.0)
amq-protocol (2.3.2)
audited (4.10.0)
activerecord (>= 4.2, < 6.2)
autoprefixer-rails (10.2.5.0)
execjs (< 2.8.0)
autoprefixer-rails (10.2.5.1)
execjs (> 0)
aws-eventstream (1.1.1)
aws-partitions (1.457.0)
aws-sdk-core (3.114.0)
aws-partitions (1.477.0)
aws-sdk-core (3.117.0)
aws-eventstream (~> 1, >= 1.0.2)
aws-partitions (~> 1, >= 1.239.0)
aws-sigv4 (~> 1.1)
jmespath (~> 1.0)
aws-sdk-kms (1.43.0)
aws-sdk-kms (1.44.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.92.0)
aws-sdk-core (~> 3, >= 3.112.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.1)
aws-sigv4 (1.2.3)
aws-sigv4 (1.2.4)
aws-eventstream (~> 1, >= 1.0.2)
batch-loader (1.4.1)
bindex (0.8.1)
......@@ -97,8 +97,9 @@ GEM
popper_js (>= 1.14.3, < 2)
sassc-rails (>= 2.0.0)
builder (3.2.4)
bunny (2.17.0)
bunny (2.19.0)
amq-protocol (~> 2.3, >= 2.3.1)
sorted_set (~> 1, >= 1.0.2)
bunny-mock (1.7.0)
bunny (>= 1.7)
bunny_events (0.3.2)
......@@ -106,15 +107,16 @@ GEM
case_transform (0.2)
activesupport
chunky_png (1.4.0)
concurrent-ruby (1.1.8)
concurrent-ruby (1.1.9)
crack (0.4.5)
rexml
crass (1.0.6)
ddtrace (0.46.0)
ddtrace (0.51.0)
ffi (~> 1.0)
msgpack
delayed_job (4.1.9)
activesupport (>= 3.0, < 6.2)
delayed_job_active_record (4.1.5)
delayed_job_active_record (4.1.6)
activerecord (>= 3.0, < 6.2)
delayed_job (>= 3.0, < 5)
diff-lcs (1.4.4)
......@@ -126,15 +128,15 @@ GEM
dotenv (= 2.7.6)
railties (>= 3.2)
erubi (1.10.0)
execjs (2.7.0)
execjs (2.8.1)
factory_bot (6.1.0)
activesupport (>= 5.0.0)
factory_bot_rails (6.1.0)
factory_bot (~> 6.1.0)
railties (>= 5.0.0)
faker (2.17.0)
faker (2.18.0)
i18n (>= 1.6, < 2)
ffi (1.15.0)
ffi (1.15.3)
generator_spec (0.9.4)
activesupport (>= 3.0.0)
railties (>= 3.0.0)
......@@ -158,7 +160,7 @@ GEM
thor (>= 0.14, < 2.0)
json (2.5.1)
jsonapi-renderer (0.2.2)
jwt (2.2.2)
jwt (2.2.3)
libv8 (8.4.255.0)
listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
......@@ -168,7 +170,7 @@ GEM
activesupport (>= 4)
railties (>= 4)
request_store (~> 1.0)
loofah (2.9.1)
loofah (2.10.0)
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
mail (2.7.1)
......@@ -177,9 +179,9 @@ GEM
method_source (1.0.0)
mime-types (3.3.1)
mime-types-data (~> 3.2015)
mime-types-data (3.2021.0225)
mime-types-data (3.2021.0704)
mini_mime (1.0.3)
mini_portile2 (2.5.1)
mini_portile2 (2.5.3)
mini_racer (0.3.1)
libv8 (~> 8.4.255)
minitest (5.14.4)
......@@ -198,7 +200,7 @@ GEM
activesupport
bunny
nio4r (2.5.7)
nokogiri (1.11.4)
nokogiri (1.11.7)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
pg (1.2.3)
......@@ -252,12 +254,13 @@ GEM
rb-fsevent (0.11.0)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.2.5)
rbtree (0.4.4)
redis (4.3.1)
redis-actionpack (5.2.0)
actionpack (>= 5, < 7)
redis-rack (>= 2.1.0, < 3)
redis-store (>= 1.1.0, < 2)
redis-activesupport (5.2.0)
redis-activesupport (5.2.1)
activesupport (>= 3, < 7)
redis-store (>= 1.3, < 2)
redis-rack (2.1.3)
......@@ -275,7 +278,7 @@ GEM
rqrcode (2.0.0)
chunky_png (~> 1.0)
rqrcode_core (~> 1.0)
rqrcode_core (1.0.0)
rqrcode_core (1.1.0)
rqrcode_png (0.1.5)
chunky_png
rqrcode
......@@ -318,6 +321,7 @@ GEM
tilt
serverengine (2.1.1)
sigdump (~> 0.2.2)
set (1.0.1)
shoulda-matchers (4.5.1)
activesupport (>= 4.2.0)
sigdump (0.2.4)
......@@ -333,6 +337,9 @@ GEM
rake (~> 12.3)
serverengine (~> 2.1.0)
thor
sorted_set (1.0.3)
rbtree
set (~> 1.0)
spring (2.1.1)
spring-watcher-listen (2.0.1)
listen (>= 2.7, < 4.0)
......@@ -365,7 +372,7 @@ GEM
addressable (>= 2.3.6)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
websocket-driver (0.7.3)
websocket-driver (0.7.5)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.5)
zeitwerk (2.4.2)
......@@ -382,17 +389,17 @@ DEPENDENCIES
bootstrap (= 4.6.0)
bunny-mock (= 1.7.0)
bunny_events (= 0.3.2)
ddtrace (= 0.46.0)
delayed_job_active_record (= 4.1.5)
ddtrace (= 0.51.0)
delayed_job_active_record (= 4.1.6)
discard (= 1.2.0)
dotenv-rails (= 2.7.6)
factory_bot_rails (= 6.1.0)
faker (= 2.17.0)
faker (= 2.18.0)
hcaptcha (= 7.1.0)
health_check (= 3.0.0)
httparty (= 0.18.1)
jquery-rails (= 4.4.0)
jwt (= 2.2.2)
jwt (= 2.2.3)
lograge (= 0.11.2)
mini_racer (= 0.3.1)
mysql2 (= 0.5.3)
......