Shared the fix between both script, added its import to both Dockerfiles

Author: Raynooo

Dockerfile_jenkins_spec_check

@@ -3,5 +3,6 @@ RUN apt-get update
 RUN apt-get install -y python3-pip
 RUN pip3 install dockerfile_parse requests
 COPY jenkins_container_spec_check.py /root/
+COPY dockerparse_arg_fix.py /root/
 
 ENTRYPOINT ["/usr/bin/python3", "/root/jenkins_container_spec_check.py"]

Dockerfile_jenkins_version

@@ -3,5 +3,6 @@ RUN apt-get update
 RUN apt-get install -y python3-pip
 RUN pip3 install dockerfile_parse requests
 COPY jenkins_container_version.py /root/
+COPY dockerparse_arg_fix.py /root/
 
 ENTRYPOINT ["/usr/bin/python3", "/root/jenkins_container_version.py"]

dockerparse_arg_fix.py

@@ -0,0 +1,22 @@
+from dockerfile_parse import DockerfileParser
+from dockerfile_parse.util import WordSplitter
+
+def reload_arg_to_env (dfp, content):
+	recipe_args = dict()
+	for crtInstr in dfp.structure:
+		if crtInstr['instruction']=="ARG":
+			parts = crtInstr['value'].split('=')
+			if len(parts) != 2:
+				print("An ARG instruction is wrongly formatted")
+				sys.exit(1)
+			#If an ARG can be parsed, it is added to a temp env dictionary
+			crt_value = WordSplitter(parts[1]).dequote()
+			recipe_args[parts[0]]=crt_value
+
+	if len(recipe_args.keys())>0:
+		#We must re-initialize the parser while including the ARG dictionary
+		print ("Updating parser with newly found ARG instructions")
+		dfp = DockerfileParser(parent_env = recipe_args)
+		dfp.content = content
+
+	return dfp

jenkins_container_spec_check.py

@@ -5,6 +5,8 @@
 import logging
 import re
 
+import dockerparse_arg_fix
+
 def send_comment(comment):
     if 'GITHUB_STATUS_TOKEN' not in os.environ:
         logging.info(str({
@@ -93,6 +95,10 @@ def send_status(software, status, msg=None):
 
 dfp = DockerfileParser()
 dfp.content = content
+
+#Need to double check on ARGs here
+dfp = dockerparse_arg_fix.reload_arg_to_env(dfp, content)
+
 labels = dfp.labels
 status = True
 msg = []

jenkins_container_version.py

@@ -1,10 +1,11 @@
 from dockerfile_parse import DockerfileParser
-from dockerfile_parse.util import WordSplitter
 import sys
 import os
 import logging
 import re
 
+import dockerparse_arg_fix
+
 docker_file = None
 if len(sys.argv) > 1 and sys.argv[1]:
     docker_file = sys.argv[1]
@@ -20,24 +21,8 @@
 dfp = DockerfileParser()
 dfp.content = content
 
-###DockerfileParser doesn't know how to link ARG declarations to their subsequent use
-##Parsing all ARGs
-recipe_args = dict()
-for crtInstr in dfp.structure:
-	if crtInstr['instruction']=="ARG":
-		parts = crtInstr['value'].split('=')
-		if len(parts) != 2:
-			print("An ARG instruction is wrongly formatted")
-			sys.exit(1)
-		#If an ARG can be parsed, it is added to a temp env dictionary
-		crt_value = WordSplitter(parts[1]).dequote()
-		recipe_args[parts[0]]=crt_value
-
-if len(recipe_args.keys())>0:
-	#We must re-initialize the parser while including the ARG dictionary
-	print ("Updating parser with newly found ARG instructions")
-	dfp = DockerfileParser(parent_env = recipe_args)
-	dfp.content = content
+#Applying our fix to load ARGs until DockerfileParser handles them
+dfp = dockerparse_arg_fix.reload_arg_to_env(dfp, content)
 
 #Moved here to avoid repeating this step
 labels = dfp.labels