fix: re-introduce -ubi suffixed images

elastic · Dec 31, 2024 · c7663c2 · c7663c2
1 parent 69dc601
commit c7663c2
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 0 deletions.
diff --git a/dev-tools/mage/dockervariants.go b/dev-tools/mage/dockervariants.go
@@ -12,6 +12,7 @@ import (
 const (
 	undefined     = "undefined"
 	basic         = "basic"
+	ubi           = "ubi"
 	wolfi         = "wolfi"
 	complete      = "complete"
 	completeWolfi = "complete-wolfi"
@@ -26,6 +27,7 @@ type DockerVariant int
 const (
 	Undefined = iota
 	Basic
+	UBI
 	Wolfi
 	WolfiComplete
 	Complete
@@ -40,6 +42,8 @@ func (typ DockerVariant) String() string {
 		return undefined
 	case Basic:
 		return basic
+	case UBI:
+		return ubi
 	case Wolfi:
 		return wolfi
 	case WolfiComplete:
@@ -67,6 +71,8 @@ func (typ *DockerVariant) UnmarshalText(text []byte) error {
 		*typ = Undefined
 	case basic:
 		*typ = Basic
+	case ubi:
+		*typ = UBI
 	case wolfi:
 		*typ = Wolfi
 	case completeWolfi:

diff --git a/dev-tools/packaging/packages.yml b/dev-tools/packaging/packages.yml
@@ -657,6 +657,28 @@ specs:
         <<: *docker_elastic_spec
         <<: *elastic_license_for_binaries
 
+    # keep producing ubi suffixed images
+    - os: linux
+      arch: amd64
+      types: [docker]
+      spec:
+        <<: *docker_spec
+        <<: *docker_ubi_spec
+        <<: *docker_builder_spec
+        <<: *docker_elastic_spec
+        <<: *elastic_license_for_binaries
+        docker_variant: "ubi"
+    - os: linux
+      arch: arm64
+      types: [docker]
+      spec:
+        <<: *docker_spec
+        <<: *docker_ubi_arm_spec
+        <<: *docker_builder_arm_spec
+        <<: *docker_elastic_spec
+        <<: *elastic_license_for_binaries
+        docker_variant: "ubi"
+
     - os: linux
       arch: amd64
       types: [docker]
@@ -913,6 +935,32 @@ specs:
         files:
           '{{.BeatName}}{{.BinaryExt}}':
             source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
+    - os: linux
+      arch: amd64
+      types: [docker]
+      spec:
+        <<: *docker_ubi_spec
+        <<: *docker_builder_spec
+        <<: *agent_docker_spec
+        <<: *docker_elastic_spec
+        <<: *elastic_license_for_binaries
+        docker_variant: 'ubi'
+        files:
+          '{{.BeatName}}{{.BinaryExt}}':
+            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
+    - os: linux
+      arch: arm64
+      types: [docker]
+      spec:
+        <<: *docker_ubi_arm_spec
+        <<: *docker_builder_arm_spec
+        <<: *agent_docker_spec
+        <<: *docker_elastic_spec
+        <<: *elastic_license_for_binaries
+        docker_variant: 'ubi'
+        files:
+          '{{.BeatName}}{{.BinaryExt}}':
+            source: ./build/golang-crossbuild/{{.BeatName}}-{{.GOOS}}-{{.Platform.Arch}}{{.BinaryExt}}
     - os: linux
       arch: amd64
       types: [docker]