Skip to content

Commit 17962e5

Browse files
authored
Merge pull request #1 from nickjj/main
Upstream updates
2 parents a1c84d1 + 2e6bf77 commit 17962e5

File tree

7 files changed

+236
-235
lines changed

7 files changed

+236
-235
lines changed

CHANGELOG.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,27 +17,27 @@ Changelog](https://keepachangelog.com/en/1.0.0/).
1717

1818
- Update `Node` to `20.X`
1919
- Update `Postgres` to `16.0`
20-
- Update `Redis` to `7.2.1`
20+
- Update `Redis` to `7.2.3`
2121

2222
#### Back-end dependencies
2323

2424
- Update `cssbundling-rails` to `1.3.0`
2525
- Update `jsbundling-rails` to `1.2.0`
2626
- Update `puma` to `6.4.0`
2727
- Update `rack-mini-profiler` to `3.1.1`
28-
- Update `rails` to `7.1.1`
29-
- Update `redis` to `5.0.7`
30-
- Update `sidekiq` to `7.1.6`
28+
- Update `rails` to `7.1.2`
29+
- Update `redis` to `5.0.8`
30+
- Update `sidekiq` to `7.2.0`
3131
- Update `stimulus-rails` to `1.3.0`
3232
- Update `turbo-rails` to `1.5.0`
3333

3434
#### Front-end dependencies
3535

3636
- Update `@hotwired/stimulus` to `3.2.2`
3737
- Update `autoprefixer` to `10.4.16`
38-
- Update `esbuild` to `0.19.4`
38+
- Update `esbuild` to `0.19.5`
3939
- Update `postcss` to `8.4.31`
40-
- Update `tailwindcss` to `3.3.3`
40+
- Update `tailwindcss` to `3.3.5`
4141

4242
## [0.8.0] - 2023-05-13
4343

Gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
ruby "3.2.2"
55

66
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
7-
gem "rails", "~> 7.1.1"
7+
gem "rails", "~> 7.1.2"
88

99
# The original asset pipeline for Rails [https://github.com/rails/sprockets-rails]
1010
gem "sprockets-rails"
@@ -43,7 +43,7 @@ gem "tzinfo-data", platforms: %i[ mingw mswin x64_mingw jruby ]
4343
# gem "image_processing", "~> 1.2"
4444

4545
# Execute jobs in the background [https://github.com/mperham/sidekiq]
46-
gem "sidekiq", "~> 7.1"
46+
gem "sidekiq", "~> 7.2"
4747

4848
# CORS
4949
gem 'rack-cors'

Gemfile.lock

Lines changed: 75 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,71 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actioncable (7.1.1)
5-
actionpack (= 7.1.1)
6-
activesupport (= 7.1.1)
4+
actioncable (7.1.2)
5+
actionpack (= 7.1.2)
6+
activesupport (= 7.1.2)
77
nio4r (~> 2.0)
88
websocket-driver (>= 0.6.1)
99
zeitwerk (~> 2.6)
10-
actionmailbox (7.1.1)
11-
actionpack (= 7.1.1)
12-
activejob (= 7.1.1)
13-
activerecord (= 7.1.1)
14-
activestorage (= 7.1.1)
15-
activesupport (= 7.1.1)
10+
actionmailbox (7.1.2)
11+
actionpack (= 7.1.2)
12+
activejob (= 7.1.2)
13+
activerecord (= 7.1.2)
14+
activestorage (= 7.1.2)
15+
activesupport (= 7.1.2)
1616
mail (>= 2.7.1)
1717
net-imap
1818
net-pop
1919
net-smtp
20-
actionmailer (7.1.1)
21-
actionpack (= 7.1.1)
22-
actionview (= 7.1.1)
23-
activejob (= 7.1.1)
24-
activesupport (= 7.1.1)
20+
actionmailer (7.1.2)
21+
actionpack (= 7.1.2)
22+
actionview (= 7.1.2)
23+
activejob (= 7.1.2)
24+
activesupport (= 7.1.2)
2525
mail (~> 2.5, >= 2.5.4)
2626
net-imap
2727
net-pop
2828
net-smtp
2929
rails-dom-testing (~> 2.2)
30-
actionpack (7.1.1)
31-
actionview (= 7.1.1)
32-
activesupport (= 7.1.1)
30+
actionpack (7.1.2)
31+
actionview (= 7.1.2)
32+
activesupport (= 7.1.2)
3333
nokogiri (>= 1.8.5)
34+
racc
3435
rack (>= 2.2.4)
3536
rack-session (>= 1.0.1)
3637
rack-test (>= 0.6.3)
3738
rails-dom-testing (~> 2.2)
3839
rails-html-sanitizer (~> 1.6)
39-
actiontext (7.1.1)
40-
actionpack (= 7.1.1)
41-
activerecord (= 7.1.1)
42-
activestorage (= 7.1.1)
43-
activesupport (= 7.1.1)
40+
actiontext (7.1.2)
41+
actionpack (= 7.1.2)
42+
activerecord (= 7.1.2)
43+
activestorage (= 7.1.2)
44+
activesupport (= 7.1.2)
4445
globalid (>= 0.6.0)
4546
nokogiri (>= 1.8.5)
46-
actionview (7.1.1)
47-
activesupport (= 7.1.1)
47+
actionview (7.1.2)
48+
activesupport (= 7.1.2)
4849
builder (~> 3.1)
4950
erubi (~> 1.11)
5051
rails-dom-testing (~> 2.2)
5152
rails-html-sanitizer (~> 1.6)
52-
activejob (7.1.1)
53-
activesupport (= 7.1.1)
53+
activejob (7.1.2)
54+
activesupport (= 7.1.2)
5455
globalid (>= 0.3.6)
55-
activemodel (7.1.1)
56-
activesupport (= 7.1.1)
57-
activerecord (7.1.1)
58-
activemodel (= 7.1.1)
59-
activesupport (= 7.1.1)
56+
activemodel (7.1.2)
57+
activesupport (= 7.1.2)
58+
activerecord (7.1.2)
59+
activemodel (= 7.1.2)
60+
activesupport (= 7.1.2)
6061
timeout (>= 0.4.0)
61-
activestorage (7.1.1)
62-
actionpack (= 7.1.1)
63-
activejob (= 7.1.1)
64-
activerecord (= 7.1.1)
65-
activesupport (= 7.1.1)
62+
activestorage (7.1.2)
63+
actionpack (= 7.1.2)
64+
activejob (= 7.1.2)
65+
activerecord (= 7.1.2)
66+
activesupport (= 7.1.2)
6667
marcel (~> 1.0)
67-
activesupport (7.1.1)
68+
activesupport (7.1.2)
6869
base64
6970
bigdecimal
7071
concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -76,10 +77,10 @@ GEM
7677
tzinfo (~> 2.0)
7778
addressable (2.8.5)
7879
public_suffix (>= 2.0.2, < 6.0)
79-
base64 (0.1.1)
80+
base64 (0.2.0)
8081
bigdecimal (3.1.4)
8182
bindex (0.8.1)
82-
bootsnap (1.16.0)
83+
bootsnap (1.17.0)
8384
msgpack (~> 1.2)
8485
builder (3.2.4)
8586
capybara (3.39.2)
@@ -96,19 +97,19 @@ GEM
9697
crass (1.0.6)
9798
cssbundling-rails (1.3.3)
9899
railties (>= 6.0.0)
99-
date (3.3.3)
100+
date (3.3.4)
100101
debug (1.8.0)
101102
irb (>= 1.5.0)
102103
reline (>= 0.3.1)
103-
drb (2.1.1)
104+
drb (2.2.0)
104105
ruby2_keywords
105106
erubi (1.12.0)
106107
globalid (1.2.1)
107108
activesupport (>= 6.1)
108109
i18n (1.14.1)
109110
concurrent-ruby (~> 1.0)
110111
io-console (0.6.0)
111-
irb (1.8.3)
112+
irb (1.9.0)
112113
rdoc
113114
reline (>= 0.3.8)
114115
jbuilder (2.11.5)
@@ -129,13 +130,13 @@ GEM
129130
mini_mime (1.1.5)
130131
minitest (5.20.0)
131132
msgpack (1.7.2)
132-
mutex_m (0.1.2)
133-
net-imap (0.4.1)
133+
mutex_m (0.2.0)
134+
net-imap (0.4.4)
134135
date
135136
net-protocol
136137
net-pop (0.1.2)
137138
net-protocol
138-
net-protocol (0.2.1)
139+
net-protocol (0.2.2)
139140
timeout
140141
net-smtp (0.4.0)
141142
net-protocol
@@ -150,7 +151,7 @@ GEM
150151
public_suffix (5.0.3)
151152
puma (6.4.0)
152153
nio4r (~> 2.0)
153-
racc (1.7.1)
154+
racc (1.7.3)
154155
rack (3.0.8)
155156
rack-mini-profiler (3.1.1)
156157
rack (>= 1.2.0)
@@ -161,44 +162,44 @@ GEM
161162
rackup (2.1.0)
162163
rack (>= 3)
163164
webrick (~> 1.8)
164-
rails (7.1.1)
165-
actioncable (= 7.1.1)
166-
actionmailbox (= 7.1.1)
167-
actionmailer (= 7.1.1)
168-
actionpack (= 7.1.1)
169-
actiontext (= 7.1.1)
170-
actionview (= 7.1.1)
171-
activejob (= 7.1.1)
172-
activemodel (= 7.1.1)
173-
activerecord (= 7.1.1)
174-
activestorage (= 7.1.1)
175-
activesupport (= 7.1.1)
165+
rails (7.1.2)
166+
actioncable (= 7.1.2)
167+
actionmailbox (= 7.1.2)
168+
actionmailer (= 7.1.2)
169+
actionpack (= 7.1.2)
170+
actiontext (= 7.1.2)
171+
actionview (= 7.1.2)
172+
activejob (= 7.1.2)
173+
activemodel (= 7.1.2)
174+
activerecord (= 7.1.2)
175+
activestorage (= 7.1.2)
176+
activesupport (= 7.1.2)
176177
bundler (>= 1.15.0)
177-
railties (= 7.1.1)
178+
railties (= 7.1.2)
178179
rails-dom-testing (2.2.0)
179180
activesupport (>= 5.0.0)
180181
minitest
181182
nokogiri (>= 1.6)
182183
rails-html-sanitizer (1.6.0)
183184
loofah (~> 2.21)
184185
nokogiri (~> 1.14)
185-
railties (7.1.1)
186-
actionpack (= 7.1.1)
187-
activesupport (= 7.1.1)
186+
railties (7.1.2)
187+
actionpack (= 7.1.2)
188+
activesupport (= 7.1.2)
188189
irb
189190
rackup (>= 1.0.0)
190191
rake (>= 12.2)
191192
thor (~> 1.0, >= 1.2.2)
192193
zeitwerk (~> 2.6)
193-
rake (13.0.6)
194-
rdoc (6.5.0)
194+
rake (13.1.0)
195+
rdoc (6.6.0)
195196
psych (>= 4.0.0)
196-
redis (5.0.7)
197-
redis-client (>= 0.9.0)
198-
redis-client (0.17.0)
197+
redis (5.0.8)
198+
redis-client (>= 0.17.0)
199+
redis-client (0.18.0)
199200
connection_pool
200201
regexp_parser (2.8.2)
201-
reline (0.3.9)
202+
reline (0.4.0)
202203
io-console (~> 0.5)
203204
rexml (3.2.6)
204205
ruby2_keywords (0.0.5)
@@ -207,7 +208,7 @@ GEM
207208
rexml (~> 3.2, >= 3.2.5)
208209
rubyzip (>= 1.2.2, < 3.0)
209210
websocket (~> 1.0)
210-
sidekiq (7.1.6)
211+
sidekiq (7.2.0)
211212
concurrent-ruby (< 2)
212213
connection_pool (>= 2.3.0)
213214
rack (>= 2.2.4)
@@ -221,9 +222,9 @@ GEM
221222
sprockets (>= 3.0.0)
222223
stimulus-rails (1.3.0)
223224
railties (>= 6.0.0)
224-
stringio (3.0.8)
225-
thor (1.2.2)
226-
timeout (0.4.0)
225+
stringio (3.0.9)
226+
thor (1.3.0)
227+
timeout (0.4.1)
227228
turbo-rails (1.5.0)
228229
actionpack (>= 6.0.0)
229230
activejob (>= 6.0.0)
@@ -262,10 +263,10 @@ DEPENDENCIES
262263
pg (~> 1.1)
263264
puma (~> 6.4)
264265
rack-mini-profiler
265-
rails (~> 7.1.1)
266+
rails (~> 7.1.2)
266267
redis (~> 5.0)
267268
selenium-webdriver
268-
sidekiq (~> 7.1)
269+
sidekiq (~> 7.2)
269270
sprockets-rails
270271
stimulus-rails
271272
turbo-rails

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ practices](https://nickjanetakis.com/blog/best-practices-around-production-ready
2424
based on building and deploying dozens of assorted Dockerized web apps since
2525
late 2014.
2626

27-
**This app is using Rails 7.1.1 and Ruby 3.2.2**. The screenshot doesn't get
27+
**This app is using Rails 7.1.2 and Ruby 3.2.2**. The screenshot doesn't get
2828
updated every time I bump the versions:
2929

3030
[![Screenshot](.github/docs/screenshot.jpg)](https://github.com/nickjj/docker-rails-example/blob/main/.github/docs/screenshot.jpg?raw=true)

docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ services:
4646
limits:
4747
cpus: "${DOCKER_REDIS_CPUS:-0}"
4848
memory: "${DOCKER_REDIS_MEMORY:-0}"
49-
image: "redis:7.2.1-bookworm"
49+
image: "redis:7.2.3-bookworm"
5050
profiles: ["redis"]
5151
restart: "${DOCKER_RESTART_POLICY:-unless-stopped}"
5252
stop_grace_period: "3s"

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
"@hotwired/stimulus": "3.2.2",
66
"@hotwired/turbo-rails": "7.3.0",
77
"autoprefixer": "10.4.16",
8-
"esbuild": "0.19.4",
8+
"esbuild": "0.19.5",
99
"postcss": "8.4.31",
1010
"postcss-import": "15.1.0",
11-
"tailwindcss": "3.3.3"
11+
"tailwindcss": "3.3.5"
1212
},
1313
"scripts": {
1414
"build": "./run yarn:build",

0 commit comments

Comments
 (0)