scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-02 11:38:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor createDockerImage to be more general (#24503)

Browse Source
This commit is contained in:
Rachel Culpepper
2023-12-13 14:02:54 -05:00
committed by GitHub
parent b8050c518e
commit 0fdd8237a6
2 changed files with 30 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
vault/external_tests/seal_binary/seal_docker_util.go
View File

@@ -72,7 +72,26 @@ type transitContainerConfig struct {
KeyNames []string KeyNames []string
} }
func createDockerImage(imageRepo, imageTag, vaultBinary string) error { func createBuildContextWithBinary(vaultBinary string) (dockhelper.BuildContext, error) {
f, err := os.Open(vaultBinary)
if err != nil {
return nil, fmt.Errorf("error opening vault binary file: %w", err)
}
data, err := io.ReadAll(f)
if err != nil {
return nil, fmt.Errorf("error reading vault binary file: %w", err)
}
bCtx := dockhelper.NewBuildContext()
bCtx["vault"] = &dockhelper.FileContents{
Data: data,
Mode: 0o755,
}
return bCtx, nil
}
func createDockerImage(imageRepo, imageTag, containerFile string, bCtx dockhelper.BuildContext) error {
runner, err := dockhelper.NewServiceRunner(dockhelper.RunOptions{ runner, err := dockhelper.NewServiceRunner(dockhelper.RunOptions{
ContainerName: "vault", ContainerName: "vault",
ImageRepo: imageRepo, ImageRepo: imageRepo,
@@ -82,29 +101,10 @@ func createDockerImage(imageRepo, imageTag, vaultBinary string) error {
return fmt.Errorf("error creating runner: %w", err) return fmt.Errorf("error creating runner: %w", err)
} }
f, err := os.Open(vaultBinary)
if err != nil {
return fmt.Errorf("error opening vault binary file: %w", err)
}
data, err := io.ReadAll(f)
if err != nil {
return fmt.Errorf("error reading vault binary file: %w", err)
}
bCtx := dockhelper.NewBuildContext()
bCtx["vault"] = &dockhelper.FileContents{
Data: data,
Mode: 0o755,
}
containerFile := fmt.Sprintf(`
FROM %s:latest
COPY vault /bin/vault
`, imageRepo)
_, err = runner.BuildImage(context.Background(), containerFile, bCtx, _, err = runner.BuildImage(context.Background(), containerFile, bCtx,
dockhelper.BuildRemove(true), dockhelper.BuildForceRemove(true), dockhelper.BuildRemove(true), dockhelper.BuildForceRemove(true),
dockhelper.BuildPullParent(true), dockhelper.BuildPullParent(true),
dockhelper.BuildTags([]string{fmt.Sprintf("hashicorp/vault:%s", imageTag)})) dockhelper.BuildTags([]string{fmt.Sprintf("%s:%s", imageRepo, imageTag)}))
if err != nil { if err != nil {
return fmt.Errorf("error building docker image: %w", err) return fmt.Errorf("error building docker image: %w", err)
} }

10
vault/external_tests/seal_binary/seal_sighup_test.go
View File

@@ -101,7 +101,15 @@ func TestSealReloadSIGHUP(t *testing.T) {
}, },
} }
err = createDockerImage("hashicorp/vault", "test-image", os.Getenv("VAULT_BINARY")) containerFile := `
FROM hashicorp/vault:latest
COPY vault /bin/vault
`
bCtx, err := createBuildContextWithBinary(os.Getenv("VAULT_BINARY"))
if err != nil {
t.Fatalf("error creating build context: %s", err)
}
err = createDockerImage("hashicorp/vault", "test-image", containerFile, bCtx)
if err != nil { if err != nil {
t.Fatalf("error creating docker image: %s", err) t.Fatalf("error creating docker image: %s", err)
} }