Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

COMPOSER-2096: Add blueprint support to cloudapi & local access to cloudapi service #3757

Merged
merged 4 commits into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions cmd/osbuild-composer/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,14 +91,20 @@ func main() {
}

if l, exists := listeners["osbuild-composer.socket"]; exists {
if len(l) != 1 {
logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain only one socket.")
if len(l) != 2 {
logrus.Fatal("The osbuild-composer.socket unit is misconfigured. It should contain two sockets.")
}

err = composer.InitWeldr(repositoryConfigs, l[0], config.weldrDistrosImageTypeDenyList())
if err != nil {
logrus.Fatalf("Error initializing weldr API: %v", err)
}

// Start cloudapi using the 2nd socket and no certs
err = composer.InitAPI(ServerCertFile, ServerKeyFile, false, false, false, l[1])
if err != nil {
logrus.Fatalf("Error initializing Cloud API using local socket: %v", err)
}
}

if l, exists := listeners["osbuild-local-worker.socket"]; exists {
Expand Down
1 change: 1 addition & 0 deletions distribution/osbuild-composer.socket
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ Description=OSBuild Composer Weldr API socket

[Socket]
ListenStream=/run/weldr/api.socket
ListenStream=/run/cloudapi/api.socket
SocketGroup=weldr
SocketMode=660

Expand Down
Loading
Loading