f11589367e
Tracing the package set and repository journey, I found that the container package defined on the image type is never really used. Added notes to fix later.
73 lines
2.3 KiB
Go
73 lines
2.3 KiB
Go
package image
|
|
|
|
import (
|
|
"math/rand"
|
|
|
|
"github.com/osbuild/osbuild-composer/internal/artifact"
|
|
"github.com/osbuild/osbuild-composer/internal/environment"
|
|
"github.com/osbuild/osbuild-composer/internal/manifest"
|
|
"github.com/osbuild/osbuild-composer/internal/ostree"
|
|
"github.com/osbuild/osbuild-composer/internal/platform"
|
|
"github.com/osbuild/osbuild-composer/internal/rpmmd"
|
|
"github.com/osbuild/osbuild-composer/internal/runner"
|
|
"github.com/osbuild/osbuild-composer/internal/workload"
|
|
)
|
|
|
|
type OSTreeContainer struct {
|
|
Base
|
|
Platform platform.Platform
|
|
OSCustomizations manifest.OSCustomizations
|
|
Environment environment.Environment
|
|
Workload workload.Workload
|
|
OSTreeRef string
|
|
OSTreeParent *ostree.CommitSpec
|
|
OSVersion string
|
|
ExtraContainerPackages rpmmd.PackageSet // FIXME: this is never read
|
|
ContainerLanguage string
|
|
Filename string
|
|
}
|
|
|
|
func NewOSTreeContainer(ref string) *OSTreeContainer {
|
|
return &OSTreeContainer{
|
|
Base: NewBase("ostree-container"),
|
|
OSTreeRef: ref,
|
|
}
|
|
}
|
|
|
|
func (img *OSTreeContainer) InstantiateManifest(m *manifest.Manifest,
|
|
repos []rpmmd.RepoConfig,
|
|
runner runner.Runner,
|
|
rng *rand.Rand) (*artifact.Artifact, error) {
|
|
buildPipeline := manifest.NewBuild(m, runner, repos)
|
|
buildPipeline.Checkpoint()
|
|
|
|
osPipeline := manifest.NewOS(m, buildPipeline, img.Platform, repos)
|
|
osPipeline.OSCustomizations = img.OSCustomizations
|
|
osPipeline.Environment = img.Environment
|
|
osPipeline.Workload = img.Workload
|
|
osPipeline.OSTreeRef = img.OSTreeRef
|
|
osPipeline.OSTreeParent = img.OSTreeParent
|
|
|
|
commitPipeline := manifest.NewOSTreeCommit(m, buildPipeline, osPipeline, img.OSTreeRef)
|
|
commitPipeline.OSVersion = img.OSVersion
|
|
|
|
nginxConfigPath := "/etc/nginx.conf"
|
|
listenPort := "8080"
|
|
|
|
serverPipeline := manifest.NewOSTreeCommitServer(m,
|
|
buildPipeline,
|
|
img.Platform,
|
|
repos,
|
|
commitPipeline,
|
|
nginxConfigPath,
|
|
listenPort)
|
|
serverPipeline.Language = img.ContainerLanguage
|
|
|
|
containerPipeline := manifest.NewOCIContainer(m, buildPipeline, serverPipeline)
|
|
containerPipeline.Cmd = []string{"nginx", "-c", nginxConfigPath}
|
|
containerPipeline.ExposedPorts = []string{listenPort}
|
|
containerPipeline.Filename = img.Filename
|
|
artifact := containerPipeline.Export()
|
|
|
|
return artifact, nil
|
|
}
|