Skip to content

fix: generate database ID earlier and pull Docker image before container run #55

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.

Sign up for GitHub

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

Merged
tsivaprasad merged 2 commits into from
Jun 13, 2025
Merged

fix: generate database ID earlier and pull Docker image before container run #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2032a92
fix: generate DatabaseID before validation and pull Docker image befo…
tsivaprasad Jun 13, 2025
aa80006
Addressing review comments
tsivaprasad Jun 13, 2025
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
3 changes: 3 additions & 0 deletions server/internal/api/convert.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,6 +417,9 @@ func apiToDatabaseSpec(id, tID *string, apiSpec *api.DatabaseSpec) (*database.Sp
if err != nil {
return nil, fmt.Errorf("failed to parse database ID: %w", err)
}
if databaseID == uuid.Nil {
databaseID = uuid.New()
}
var tenantID *uuid.UUID
if tID != nil {
parsedTenantID, err := parseUUID(*tID)
Expand Down
2 changes: 1 addition & 1 deletion server/internal/database/service.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func NewService(orchestrator Orchestrator, store *Store, hostSvc *host.Service)

func (s *Service) CreateDatabase(ctx context.Context, spec *Spec) (*Database, error) {
if spec.DatabaseID == uuid.Nil {
spec.DatabaseID = uuid.New()
return nil, fmt.Errorf("DatabaseID must be set before creating a Database")
}
specExists, err := s.store.Spec.ExistsByKey(spec.DatabaseID).Exec(ctx)
if err != nil {
Expand Down
25 changes: 25 additions & 0 deletions server/internal/docker/docker.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/mount"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/swarm"
Expand Down Expand Up @@ -84,6 +85,14 @@ type ContainerRunOptions struct {
}

func (d *Docker) ContainerRun(ctx context.Context, opts ContainerRunOptions) (string, error) {
if opts.Config != nil {
if opts.Config.Image == "" {
return "", errors.New("image must be specified in container config")
}
if err := d.ensureDockerImage(ctx, opts.Config.Image); err != nil {
return "", fmt.Errorf("failed to ensure docker image %q: %w", opts.Config.Image, err)
}
}
resp, err := d.client.ContainerCreate(ctx, opts.Config, opts.Host, opts.Net, opts.Platform, opts.Name)
if err != nil {
return "", fmt.Errorf("failed to create container: %w", err)
Expand Down Expand Up @@ -453,6 +462,22 @@ func (d *Docker) Shutdown() error {
return nil
}

func (d *Docker) ensureDockerImage(ctx context.Context, img string) error {
// Pull the image
reader, err := d.client.ImagePull(ctx, img, image.PullOptions{})
if err != nil {
return fmt.Errorf("failed to pull image %q: %w", img, err)
}
defer reader.Close()

// Read the output from the pull operation
if _, err := io.Copy(io.Discard, reader); err != nil {
return fmt.Errorf("failed to read image pull output: %w", err)
}

return nil
}

type NetworkInfo struct {
Name string
ID string
Expand Down