Merge branch 'master' into msb/warn

fossas · Sep 12, 2024 · a8b78b0 · a8b78b0
2 parents cdcb8c2 + cc34d94
commit a8b78b0
Showing 1 changed file with 9 additions and 12 deletions.
diff --git a/test/Container/RegistryApiSpec.hs b/test/Container/RegistryApiSpec.hs
@@ -87,7 +87,7 @@ registryApiSpec =
           confDigest <- getImageConfig amd64 githubImageWithDigest
           confDigest `shouldBe'` githubImageConfigDigest
 
-        it' "should get manifest for multi-platform image (chooses target platform)" $ do
+        it' "should get manifest for multi-platform image (chooses target platform - graalvm-ce)" $ do
           confDigest <- getImageConfig amd64 githubMultiArchImage
           confDigest `shouldBe'` githubMultiArchImageConfigDigest
 
@@ -104,11 +104,11 @@ registryApiSpec =
           confDigest <- getImageConfig amd64 dhImageWithDigest
           confDigest `shouldBe'` dhImageDigest
 
-        it' "should get manifest for multi-platform image (chooses target platform)" $ do
-          confDigest <- getImageConfig arm dhMultiArchImage
-          confDigest `shouldBe'` dhMultiArchImageDigest
+        it' "should get manifest for multi-platform image (chooses target platform - grafana arm)" $ do
+          confDigest <- getImageConfig arm64 grafanaMultiArchImage
+          confDigest `shouldBe'` grafanaMultiArchImageDigest
 
-        it' "should get manifest for multi-platform images (chooses target platform)" $ do
+        it' "should get manifest for multi-platform images (chooses target platform -  redis arm64)" $ do
           redisDigest <- getImageConfig arm64 redisImage
           redisDigest `shouldBe'` redisImageDigest
 
@@ -118,9 +118,6 @@ amd64 = "amd64"
 arm64 :: Text
 arm64 = "arm64"
 
-arm :: Text
-arm = "arm"
-
 githubImage :: Text
 githubImage = "ghcr.io/fossas/haskell-dev-tools:8.10.4"
 
@@ -151,11 +148,11 @@ dhImageWithDigest :: Text
 dhImageWithDigest =
   "amazon/aws-cli@sha256:7a27c26c2937a3d0b84171675709df1dc09aa331e86cad90f74ada6df7b59c89"
 
-dhMultiArchImage :: Text
-dhMultiArchImage = "grafana/grafana:8.1.7-ubuntu"
+grafanaMultiArchImage :: Text
+grafanaMultiArchImage = "grafana/grafana:8.1.7-ubuntu"
 
-dhMultiArchImageDigest :: RepoDigest
-dhMultiArchImageDigest =
+grafanaMultiArchImageDigest :: RepoDigest
+grafanaMultiArchImageDigest =
   RepoDigest "sha256:86618e1e78e4962b5abec6cc7fabe89010ebfbbf0885cbba1aada7287457c263"
 
 mcrRegistryImage :: Text