feat: add rocky linux support (project-copacetic#605)

Signed-off-by: Miaha Cybersec <[email protected]> Signed-off-by: Miaha <[email protected]> Co-authored-by: Sertaç Özercan <[email protected]> Co-authored-by: Ashna Mehrotra <[email protected]>
ashnamehrotra · May 10, 2024 · a8c073e · a8c073e
1 parent 64a71e9
commit a8c073e
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 1 deletion.
diff --git a/integration/fixtures/test-images-non-distroless.json b/integration/fixtures/test-images-non-distroless.json
@@ -81,6 +81,14 @@
         "description": "Valid rpm DB, yum present",
         "ignoreErrors": false
     },
+    {
+        "image": "docker.io/library/rockylinux",
+        "tag": "8.9.20231119",
+        "digest": "sha256:69cecc7163282ad83e27b739fe8473b7c56e280e83827dcda60e5d37102457f1",
+        "distro": "Rocky Linux",
+        "description": "Valid rpm DB, yum present",
+        "ignoreErrors": false
+    },
     {
         "image": "docker.io/grafana/grafana-image-renderer",
         "tag" : "3.4.0",

diff --git a/integration/fixtures/test-images.json b/integration/fixtures/test-images.json
@@ -122,6 +122,14 @@
         "description": "Valid rpm DB, yum present",
         "ignoreErrors": false
     },
+    {
+        "image": "docker.io/library/rockylinux",
+        "tag": "8.9.20231119",
+        "digest": "sha256:69cecc7163282ad83e27b739fe8473b7c56e280e83827dcda60e5d37102457f1",
+        "distro": "Rocky Linux",
+        "description": "Valid rpm DB, yum present",
+        "ignoreErrors": false
+    },
     {
         "image": "docker.io/grafana/grafana-image-renderer",
         "tag" : "3.4.0",

diff --git a/pkg/patch/patch.go b/pkg/patch/patch.go
@@ -313,6 +313,8 @@ func getOSType(ctx context.Context, osreleaseBytes []byte) (string, error) {
 		return "cbl-mariner", nil
 	case strings.Contains(osType, "red hat"):
 		return "redhat", nil
+	case strings.Contains(osType, "rocky"):
+		return "rocky", nil
 	default:
 		log.Error("unsupported osType", osType)
 		return "", errors.ErrUnsupported

diff --git a/pkg/patch/patch_test.go b/pkg/patch/patch_test.go
@@ -165,6 +165,27 @@ func TestGetOSType(t *testing.T) {
 			err:            nil,
 			expectedOSType: "redhat",
 		},
+		{
+			osRelease: []byte(`NAME="Rocky Linux"
+			VERSION="9.3 (Blue Onyx)"
+			ID="rocky"
+			ID_LIKE="rhel centos fedora"
+			VERSION_ID="9.3"
+			PLATFORM_ID="platform:el9"
+			PRETTY_NAME="Rocky Linux 9.3 (Blue Onyx)"
+			ANSI_COLOR="0;32"
+			LOGO="fedora-logo-icon"
+			CPE_NAME="cpe:/o:rocky:rocky:9::baseos"
+			HOME_URL="https://rockylinux.org/"
+			BUG_REPORT_URL="https://bugs.rockylinux.org/"
+			SUPPORT_END="2032-05-31"
+			ROCKY_SUPPORT_PRODUCT="Rocky-Linux-9"
+			ROCKY_SUPPORT_PRODUCT_VERSION="9.3"
+			REDHAT_SUPPORT_PRODUCT="Rocky Linux"
+			REDHAT_SUPPORT_PRODUCT_VERSION="9.3"`),
+			err:            nil,
+			expectedOSType: "rocky",
+		},
 		{
 			osRelease:      nil,
 			err:            errors.ErrUnsupported,

diff --git a/pkg/pkgmgr/pkgmgr.go b/pkg/pkgmgr/pkgmgr.go
@@ -33,7 +33,7 @@ func GetPackageManager(osType string, config *buildkit.Config, workingFolder str
 		return &apkManager{config: config, workingFolder: workingFolder}, nil
 	case "debian", "ubuntu":
 		return &dpkgManager{config: config, workingFolder: workingFolder}, nil
-	case "cbl-mariner", "centos", "redhat", "amazon":
+	case "cbl-mariner", "centos", "redhat", "rocky", "amazon":
 		return &rpmManager{config: config, workingFolder: workingFolder}, nil
 	default:
 		return nil, fmt.Errorf("unsupported osType %s specified", osType)