feat: reference extended base image in install-config

.mockery.yml

@@ -18,10 +18,18 @@ packages:
     config:
       all: true
     interfaces:
+  github.com/codesphere-cloud/oms/internal/installer:
+    config:
+      all: true
+    interfaces:
   github.com/codesphere-cloud/oms/internal/portal:
     config:
       all: true
     interfaces:
+  github.com/codesphere-cloud/oms/internal/system:
+    config:
+      all: true
+    interfaces:
   github.com/codesphere-cloud/oms/internal/util:
     config:
       all: true

NOTICE

@@ -9,11 +9,17 @@ Version: v3.5.1
 License: MIT
 License URL: https://github.com/blang/semver/blob/v3.5.1/LICENSE
 
+----------
+Module: github.com/clipperhouse/stringish
+Version: v0.1.1
+License: MIT
+License URL: https://github.com/clipperhouse/stringish/blob/v0.1.1/LICENSE
+
 ----------
 Module: github.com/clipperhouse/uax29/v2
-Version: v2.2.0
+Version: v2.3.0
 License: MIT
-License URL: https://github.com/clipperhouse/uax29/blob/v2.2.0/LICENSE
+License URL: https://github.com/clipperhouse/uax29/blob/v2.3.0/LICENSE
 
 ----------
 Module: github.com/codesphere-cloud/cs-go/pkg/io
@@ -71,9 +77,9 @@ License URL: https://github.com/inconshreveable/go-update/blob/8152e7eb6ccf/inte
 
 ----------
 Module: github.com/jedib0t/go-pretty/v6
-Version: v6.6.8
+Version: v6.6.9
 License: MIT
-License URL: https://github.com/jedib0t/go-pretty/blob/v6.6.8/LICENSE
+License URL: https://github.com/jedib0t/go-pretty/blob/v6.6.9/LICENSE
 
 ----------
 Module: github.com/mattn/go-runewidth
@@ -113,9 +119,9 @@ License URL: https://github.com/spf13/pflag/blob/v1.0.10/LICENSE
 
 ----------
 Module: github.com/stretchr/objx
-Version: v0.5.2
+Version: v0.5.3
 License: MIT
-License URL: https://github.com/stretchr/objx/blob/v0.5.2/LICENSE
+License URL: https://github.com/stretchr/objx/blob/v0.5.3/LICENSE
 
 ----------
 Module: github.com/stretchr/testify
@@ -137,21 +143,21 @@ License URL: https://github.com/ulikunitz/xz/blob/v0.5.15/LICENSE
 
 ----------
 Module: golang.org/x/crypto
-Version: v0.42.0
+Version: v0.43.0
 License: BSD-3-Clause
-License URL: https://cs.opensource.google/go/x/crypto/+/v0.42.0:LICENSE
+License URL: https://cs.opensource.google/go/x/crypto/+/v0.43.0:LICENSE
 
 ----------
 Module: golang.org/x/oauth2
-Version: v0.30.0
+Version: v0.32.0
 License: BSD-3-Clause
-License URL: https://cs.opensource.google/go/x/oauth2/+/v0.30.0:LICENSE
+License URL: https://cs.opensource.google/go/x/oauth2/+/v0.32.0:LICENSE
 
 ----------
 Module: golang.org/x/text
-Version: v0.29.0
+Version: v0.30.0
 License: BSD-3-Clause
-License URL: https://cs.opensource.google/go/x/text/+/v0.29.0:LICENSE
+License URL: https://cs.opensource.google/go/x/text/+/v0.30.0:LICENSE
 
 ----------
 Module: gopkg.in/yaml.v3

cli/cmd/build.go

@@ -0,0 +1,26 @@
+// Copyright (c) Codesphere Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"github.com/codesphere-cloud/cs-go/pkg/io"
+	"github.com/spf13/cobra"
+)
+
+// BuildCmd represents the build command
+type BuildCmd struct {
+	cmd *cobra.Command
+}
+
+func AddBuildCmd(rootCmd *cobra.Command, opts *GlobalOptions) {
+	build := BuildCmd{
+		cmd: &cobra.Command{
+			Use:   "build",
+			Short: "Build and push images to a registry",
+			Long:  io.Long(`Build and push container images to a registry using the provided configuration.`),
+		},
+	}
+	rootCmd.AddCommand(build.cmd)
+	AddBuildImagesCmd(build.cmd, opts)
+}

cli/cmd/build_images.go

@@ -0,0 +1,105 @@
+// Copyright (c) Codesphere Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+package cmd
+
+import (
+	"context"
+	"fmt"
+	"log"
+
+	"github.com/codesphere-cloud/cs-go/pkg/io"
+	"github.com/codesphere-cloud/oms/internal/env"
+	"github.com/codesphere-cloud/oms/internal/installer"
+	"github.com/codesphere-cloud/oms/internal/system"
+	"github.com/codesphere-cloud/oms/internal/util"
+	"github.com/codesphere-cloud/oms/internal/version"
+	"github.com/spf13/cobra"
+)
+
+// BuildImagesCmd represents the build images command
+type BuildImagesCmd struct {
+	cmd  *cobra.Command
+	Opts *BuildImagesOpts
+	Env  env.Env
+}
+
+type BuildImagesOpts struct {
+	*GlobalOptions
+	Config string
+}
+
+func (c *BuildImagesCmd) RunE(_ *cobra.Command, args []string) error {
+	cm := installer.NewConfig()
+	im := system.NewImage(context.Background())
+
+	err := c.BuildAndPushImages(cm, im)
+	if err != nil {
+		return fmt.Errorf("failed to build and push images: %w", err)
+	}
+
+	return nil
+}
+
+func AddBuildImagesCmd(build *cobra.Command, opts *GlobalOptions) {
+	buildImages := BuildImagesCmd{
+		cmd: &cobra.Command{
+			Use:   "images",
+			Short: "Build and push container images",
+			Long: io.Long(`Build and push container images based on the configuration file.
+			Extracts necessary images configuration to get the bomRef and processes them.`),
+		},
+		Opts: &BuildImagesOpts{GlobalOptions: opts},
+		Env:  env.NewEnv(),
+	}
+	buildImages.cmd.Flags().StringVarP(&buildImages.Opts.Config, "config", "c", "", "Path to the configuration YAML file")
+
+	util.MarkFlagRequired(buildImages.cmd, "config")
+
+	build.AddCommand(buildImages.cmd)
+
+	buildImages.cmd.RunE = buildImages.RunE
+}
+
+func (c *BuildImagesCmd) BuildAndPushImages(cm installer.ConfigManager, im system.ImageManager) error {
+	config, err := cm.ParseConfigYaml(c.Opts.Config)
+	if err != nil {
+		return fmt.Errorf("failed to parse config: %w", err)
+	}
+
+	if len(config.Codesphere.DeployConfig.Images) == 0 {
+		return fmt.Errorf("no images defined in the config")
+	}
+	if len(config.Registry.Server) == 0 {
+		return fmt.Errorf("registry server not defined in the config")
+	}
+
+	v := &version.Build{}
+	codesphereVersion := v.Version()
+
+	for imageName, imageConfig := range config.Codesphere.DeployConfig.Images {
+		for flavorName, flavorConfig := range imageConfig.Flavors {
+			log.Printf("Processing image '%s' with flavor '%s'", imageName, flavorName)
+			if flavorConfig.Image.Dockerfile == "" {
+				log.Printf("Skipping flavor '%s', no dockerfile defined", flavorName)
+				continue
+			}
+
+			targetImage := fmt.Sprintf("%s/%s-%s:%s", config.Registry.Server, imageName, flavorName, codesphereVersion)
+
+			err := im.BuildImage(flavorConfig.Image.Dockerfile, targetImage, ".")
+			if err != nil {
+				return fmt.Errorf("failed to build image %s: %w", targetImage, err)
+			}
+
+			err = im.PushImage(targetImage)
+			if err != nil {
+				return fmt.Errorf("failed to push image %s: %w", targetImage, err)
+			}
+
+			log.Printf("Successfully built and pushed image: %s", targetImage)
+		}
+	}
+
+	return nil
+}