@@ -20,23 +20,19 @@ class DockerfileHandler(models.DatafileHandler):
20
20
datasource_id = 'dockerfile_oci_labels'
21
21
default_package_type = 'docker-image'
22
22
path_patterns = ('Dockerfile' , 'containerfile' , '*.dockerfile' )
23
- description = 'Dockerfile (OCI) metadata handler'
24
- documentation_url = 'https://docs.docker.com/engine/reference/builder/'
25
23
26
24
@classmethod
27
25
def parse (cls , location , package_only = False ):
28
26
"""
29
27
Parse a Dockerfile and yield one or more PackageData objects with OCI labels and metadata.
30
28
"""
31
29
labels = cls .extract_oci_labels_from_dockerfile (location )
32
-
33
-
34
30
package_data = {
35
31
'datasource_id' : cls .datasource_id ,
36
32
'type' : cls .default_package_type ,
37
- 'name' : labels .get ('name' , 'unknown ' ),
38
- 'version' : labels .get ('version' , 'unknown ' ),
39
- 'license_expression' : labels .get ('license' , 'unknown ' ),
33
+ 'name' : labels .get ('name' , 'None ' ),
34
+ 'version' : labels .get ('version' , 'None ' ),
35
+ 'license_expression' : labels .get ('license' , 'None ' ),
40
36
'labels' : labels ,
41
37
}
42
38
@@ -52,21 +48,3 @@ def extract_oci_labels_from_dockerfile(cls, dockerfile_path):
52
48
parser .parse (dockerfile_path )
53
49
labels = parser .labels
54
50
return labels
55
-
56
- @classmethod
57
- def assemble (cls , package_data , resource , codebase , package_adder ):
58
- """
59
- Assemble a Package from the parsed Dockerfile data.
60
- """
61
- if package_data .purl :
62
- package = models .Package .from_package_data (package_data = package_data , datafile_path = resource .path )
63
-
64
-
65
- package .populate_license_fields ()
66
-
67
- yield package
68
-
69
-
70
- package_adder (package .package_uid , resource , codebase )
71
-
72
- yield resource
0 commit comments