fixed bug with image labels

Author: hansehe

DockerBuildSystem/DockerImageTools.py

@@ -59,12 +59,17 @@ def GetImageRepoDigest(imageName):
     return repoDigest
 
 
+def GetImageLabels(imageName):
+    jsonInfo = GetImageInfo(imageName)
+    labels = jsonInfo['ContainerConfig']['Labels']
+    return labels
+
+
 def GetImageLabel(imageName, labelKey):
-    terminalCommand = "docker inspect --format=\"{{.Config.Labels." + labelKey + "}}\" " + imageName
-    labelValue = str(TerminalTools.ExecuteTerminalCommandAndGetOutput(terminalCommand).decode("utf-8"))
-    if len(labelValue) > 0 and labelValue[-1] == '\n':
-        labelValue = labelValue[:-1]
-    return labelValue
+    labels = GetImageLabels(imageName)
+    if labelKey in labels:
+        return labels[labelKey]
+    return '<no value>'
 
 
 def CheckImageLabelExists(imageName, labelKey):

example/Dockerfile

@@ -4,6 +4,7 @@ COPY ./pythonSnippet.py ./src/pythonSnippet.py
 
 LABEL version="1.0"
 LABEL owner="example owner"
+LABEL org.opencontainers.image.version="1.0.0"
 LABEL license="example:license"
 
 ENTRYPOINT python ./src/pythonSnippet.py

setup.py

@@ -40,7 +40,7 @@
     # For a discussion on single-sourcing the version across setup.py and the
     # project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.1.37',  # Required
+    version='1.1.38',  # Required
 
     # This is a one-line description or tagline of what your project does. This
     # corresponds to the "Summary" metadata field:

tests/TestDockerImageTools.py

@@ -55,10 +55,18 @@ def test_g_GetImageRepoDigest(self):
         self.assertFalse('\n' in repoDigest)
         print('DONE GET IMAGE REPO DIGEST')
 
+    def test_h_GetImageLabels(self):
+        print('GET IMAGE LABELS')
+        labels = DockerImageTools.GetImageLabels(TEST_IMAGE)
+        self.assertGreater(len(labels), 0)
+        self.assertTrue('owner', labels)
+        self.assertTrue(labels['owner'] == 'example owner')
+        print('DONE GET IMAGE LABELS')
+
     def test_h_GetImageLabel(self):
         print('GET IMAGE LABEL')
-        labelValue = DockerImageTools.GetImageLabel(TEST_IMAGE, 'owner')
-        self.assertEqual('example owner', labelValue)
+        labelValue = DockerImageTools.GetImageLabel(TEST_IMAGE, 'org.opencontainers.image.version')
+        self.assertEqual('1.0.0', labelValue)
 
         labelValue = DockerImageTools.GetImageLabel(TEST_IMAGE, 'none_existent')
         self.assertEqual('<no value>', labelValue)
@@ -68,6 +76,8 @@ def test_i_CheckImageLabelExists(self):
         print('CHECK IMAGE LABEL EXISTS')
         exists = DockerImageTools.CheckImageLabelExists(TEST_IMAGE, 'owner')
         self.assertTrue(exists)
+        exists = DockerImageTools.CheckImageLabelExists(TEST_IMAGE, 'org.opencontainers.image.version')
+        self.assertTrue(exists)
 
         exists = DockerImageTools.CheckImageLabelExists(TEST_IMAGE, 'none_existent')
         self.assertFalse(exists)

tests/example/output/src/pythonSnippet.py

@@ -0,0 +1,6 @@
+def GetInfoMsg():
+    infoMsg = "This python snippet is just an example.\r\n"
+    return infoMsg
+
+if __name__ == "__main__":
+    print(GetInfoMsg())