Skip to content
Merged
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
44 changes: 15 additions & 29 deletions modules/vearch/vearch.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,45 +24,31 @@ func RunContainer(ctx context.Context, opts ...testcontainers.ContainerCustomize

// Run creates an instance of the Vearch container type
func Run(ctx context.Context, img string, opts ...testcontainers.ContainerCustomizer) (*VearchContainer, error) {
req := testcontainers.ContainerRequest{
Image: img,
ExposedPorts: []string{"8817/tcp", "9001/tcp"},
Cmd: []string{"-conf=/vearch/config.toml", "all"},
HostConfigModifier: func(hc *container.HostConfig) {
moduleOpts := []testcontainers.ContainerCustomizer{
testcontainers.WithExposedPorts("8817/tcp", "9001/tcp"),
testcontainers.WithCmd("-conf=/vearch/config.toml", "all"),
testcontainers.WithHostConfigModifier(func(hc *container.HostConfig) {
hc.Privileged = true
},
Files: []testcontainers.ContainerFile{
{
HostFilePath: "config.toml",
ContainerFilePath: "/vearch/config.toml",
FileMode: 0o666,
},
},
WaitingFor: wait.ForAll(
}),
testcontainers.WithFiles(testcontainers.ContainerFile{
HostFilePath: "config.toml",
ContainerFilePath: "/vearch/config.toml",
FileMode: 0o666,
}),
testcontainers.WithWaitStrategy(
wait.ForListeningPort("8817/tcp").WithStartupTimeout(5*time.Second),
wait.ForListeningPort("9001/tcp").WithStartupTimeout(5*time.Second),
),
}

genericContainerReq := testcontainers.GenericContainerRequest{
ContainerRequest: req,
Started: true,
}

for _, opt := range opts {
if err := opt.Customize(&genericContainerReq); err != nil {
return nil, err
}
}

container, err := testcontainers.GenericContainer(ctx, genericContainerReq)
ctr, err := testcontainers.Run(ctx, img, append(moduleOpts, opts...)...)
var c *VearchContainer
if container != nil {
c = &VearchContainer{Container: container}
if ctr != nil {
c = &VearchContainer{Container: ctr}
}

if err != nil {
return c, fmt.Errorf("generic container: %w", err)
return c, fmt.Errorf("run vearch: %w", err)
}

return c, nil
Expand Down
Loading