CSEC_PUBLIC/catalyst
1
0
Fork 0
mirror of https://github.com/SecurityBrewery/catalyst.git synced 2026-01-25 15:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Set network (#31)

Browse Source 
* Set network for automation docker container
This commit is contained in:
Jonas Plum
2022-02-13 20:44:16 +01:00
committed by GitHub
parent 2d817318f2
commit 599b9d3c6e
7 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
busservice/busservice.go
View File

@@ -17,11 +17,12 @@ type busService struct {
apiURL string
apiKey string
catalystBus *bus.Bus
network string
}
func New(apiURL, apikey string, catalystBus *bus.Bus, db *database.Database) error {
func New(apiURL, apikey, network string, catalystBus *bus.Bus, db *database.Database) error {
h := &busService{db: db, apiURL: apiURL, apiKey: apikey, catalystBus: catalystBus}
h := &busService{db: db, apiURL: apiURL, apiKey: apikey, network: network, catalystBus: catalystBus}
if err := catalystBus.SubscribeRequest(h.logRequest); err != nil {
return err

14
busservice/docker.go
View File

@@ -17,7 +17,7 @@ import (
"github.com/SecurityBrewery/catalyst/database"
)
func createContainer(ctx context.Context, image, script, data string) (string, string, error) {
func createContainer(ctx context.Context, image, script, data, network string) (string, string, error) {
cli, err := client.NewClientWithOpts(client.FromEnv)
if err != nil {
return "", "", err
@@ -29,10 +29,16 @@ func createContainer(ctx context.Context, image, script, data string) (string, s
}
config := &container.Config{
Image: image, Cmd: []string{"/script", data}, WorkingDir: "/home",
AttachStderr: true, AttachStdout: true,
Image: image,
Cmd: []string{"/script", data},
WorkingDir: "/home",
AttachStderr: true,
AttachStdout: true,
}
resp, err := cli.ContainerCreate(ctx, config, nil, nil, "")
hostConfig := &container.HostConfig{
NetworkMode: container.NetworkMode(network),
}
resp, err := cli.ContainerCreate(ctx, config, hostConfig, nil, "")
if err != nil {
return "", logs, err
}

2
busservice/job.go
View File

@@ -41,7 +41,7 @@ func (h *busService) handleJob(automationMsg *bus.JobMsg) {
scriptMessage, _ := json.Marshal(automationMsg.Message)
containerID, logs, err := createContainer(ctx, automation.Image, automation.Script, string(scriptMessage))
containerID, logs, err := createContainer(ctx, automation.Image, automation.Script, string(scriptMessage), h.network)
if err != nil {
log.Println(err)
return