dockerfile-rails 1.7.7 → 1.7.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/generators/dockerfile_generator.rb +10 -3
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 323ac3d7ebfcee1a4334665dab9fb789759ef29f06b96a92b794d6469e305437
|
|
4
|
+
data.tar.gz: c23c21898c2423422c30d88c5ec4f83d5de0817b57ba6a4429a8b40b1f5a1926
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 409645b414b857ba7af576f8cef3af8123b2e32d85cd532bfc10e94783ab0b4a67671d449c021d1d45385d351c17973c30ced78787f3e8dce72b6b6663de6936
|
|
7
|
+
data.tar.gz: b6ddaee116dc09517f42e271d9ce80d5d79468083f1ab3f8cd602e5bf36426eddeb8dcdf8a6bb40c3de6b62ed4c1bcb8eda608f44c4f25aadf97d86c60e86846
|
|
@@ -410,9 +410,16 @@ class DockerfileGenerator < Rails::Generators::Base
|
|
|
410
410
|
missing = Set.new(base_packages + build_packages) -
|
|
411
411
|
Set.new(dockerfile.scan(/[-\w]+/))
|
|
412
412
|
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
413
|
+
# libyaml-dev was removed from the lightweight Ruby images
|
|
414
|
+
# https://github.com/docker-library/ruby/pull/497
|
|
415
|
+
# https://github.com/rails/rails/pull/54237
|
|
416
|
+
# Ruby versions 3.4.2, 3.3.7, and 3.2.7 have been released removing libyaml-dev
|
|
417
|
+
# Ruby version 3.1.7 will be the release version to remove libyaml-dev
|
|
418
|
+
# Older versions no longer release new images
|
|
419
|
+
matching_ruby = [">= 3.4.2", "~> 3.3.7", "~> 3.2.7", "~> 3.1.7"].any? { |v| Gem::Requirement.new(v).satisfied_by?(Gem.ruby_version) }
|
|
420
|
+
# Only slim and alpine are missing libyaml-dev/yaml-dev
|
|
421
|
+
matching_image = /FROM ruby:.+-(alpine|slim)/i.match?(dockerfile)
|
|
422
|
+
if !matching_ruby || !matching_image
|
|
416
423
|
missing.delete("libyaml-dev")
|
|
417
424
|
missing.delete("yaml-dev")
|
|
418
425
|
end
|
metadata
CHANGED
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: dockerfile-rails
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.7.
|
|
4
|
+
version: 1.7.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Sam Ruby
|
|
8
8
|
bindir: bin
|
|
9
9
|
cert_chain: []
|
|
10
|
-
date: 2025-02-
|
|
10
|
+
date: 2025-02-24 00:00:00.000000000 Z
|
|
11
11
|
dependencies:
|
|
12
12
|
- !ruby/object:Gem::Dependency
|
|
13
13
|
name: rails
|