dependabot-docker 0.171.2 → 0.172.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74e07704ba26c521724e560de9e3904de7f10959c8ebec45cae65183dcc90ed6
-  data.tar.gz: fbef4df44f0190031e60005c3bb46e597c2601f20a518086e98f6d6b9ac98c1b
+  metadata.gz: c51bf8c18d49414617bd327745b0a1869e8383cf5f3500059fa389e63361e833
+  data.tar.gz: 7bb677735c2ff6dd6daaf7f245d3af56f02121127f13b38b7f44473b171af7b0
 SHA512:
-  metadata.gz: 7155a8ef686a52540d00871e9ffffda69740e6ccb7708d3e6a32ba2b82d345e4d397a1b3673decde550ac5e8b7cc7ffb6010552aae9450b79cbe44477574d838
-  data.tar.gz: c9355f09c1326881a1239669a666f8c5729ff7935328646084c996c9e1efaba1cd0dc31c33ff08a594ba6c1d8eeaa86c63e72fa3af0d4d60f71a30d4632eb626
+  metadata.gz: 5e4f9376f2bf4bd99e466c51fdab7e951f84a82cd6ef7164e0c655d763a31338af6981a8a2911df2805cf42d152ea5f381bd546d10383c36f22bb07af277dfd3
+  data.tar.gz: 9fc9185746655203d1fa3a828aa873bfc2352cbe04b0670d115a8c72ac5504bd34d6c64713c284b57a11f371272115d1305461e4eb3bcd11b1355741a73a366c

data/lib/dependabot/docker/file_parser.rb

@@ -16,15 +16,16 @@ module Dependabot
       # Details of Docker regular expressions is at
       # https://github.com/docker/distribution/blob/master/reference/regexp.go
       DOMAIN_COMPONENT =
-        /(?:[[:alnum:]]|[[:alnum:]][[[:alnum:]]-]*[[:alnum:]])/.freeze
+        /[[:alnum:]]|[[:alnum:]][[:alnum:]-]*[[:alnum:]]/.freeze
       DOMAIN = /(?:#{DOMAIN_COMPONENT}(?:\.#{DOMAIN_COMPONENT})+)/.freeze
       REGISTRY = /(?<registry>#{DOMAIN}(?::\d+)?)/.freeze
 
-      NAME_COMPONENT = /(?:[a-z\d]+(?:(?:[._]|__|[-]*)[a-z\d]+)*)/.freeze
+      NAME_COMPONENT = /[a-z\d]+(?:(?:[._]|__|[-]*)[a-z\d]+)*/.freeze
       IMAGE = %r{(?<image>#{NAME_COMPONENT}(?:/#{NAME_COMPONENT})*)}.freeze
 
+      ARG = /ARG/i.freeze
       FROM = /FROM/i.freeze
-      PLATFORM = /--platform\=(?<platform>\S+)/.freeze
+      PLATFORM = /--platform=(?<platform>\S+)/.freeze
       TAG = /:(?<tag>[\w][\w.-]{0,127})/.freeze
       DIGEST = /@(?<digest>[^\s]+)/.freeze
       NAME = /\s+AS\s+(?<name>[\w-]+)/.freeze
@@ -38,7 +39,14 @@ module Dependabot
         dependency_set = DependencySet.new
 
         dockerfiles.each do |dockerfile|
+          args = {}
           dockerfile.content.each_line do |line|
+            if ARG.match(line)
+              key_value = line.delete_prefix("ARG ").split("=")
+              args[key_value[0]] = key_value[1].delete_suffix("\n")
+              next
+            end
+            line = replace_args(line, args)
             next unless FROM_LINE.match?(line)
 
             parsed_from_line = FROM_LINE.match(line).named_captures
@@ -66,6 +74,13 @@ module Dependabot
 
       private
 
+      def replace_args(line, args)
+        line.gsub(/\${?\w+}?/) do |s|
+          escaped = s.delete_prefix("$").delete_prefix("{").delete_suffix("}")
+          args[escaped]
+        end
+      end
+
       def dockerfiles
         # The Docker file fetcher only fetches Dockerfiles, so no need to
         # filter here

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dependabot-docker
 version: !ruby/object:Gem::Version
-  version: 0.171.2
+  version: 0.172.0
 platform: ruby
 authors:
 - Dependabot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-14 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dependabot-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.171.2
+        version: 0.172.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.171.2
+        version: 0.172.0
 - !ruby/object:Gem::Dependency
   name: debug
   requirement: !ruby/object:Gem::Requirement