Skip to content

Commit d8dc3d1

Browse files
authored
feat(internal/docker): mount repo volume in configure command (#2013)
Fixes #1766
1 parent 33501c0 commit d8dc3d1

File tree

3 files changed

+10
-0
lines changed

3 files changed

+10
-0
lines changed

internal/docker/docker.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -233,13 +233,15 @@ func (c *Docker) Configure(ctx context.Context, request *ConfigureRequest) (stri
233233
commandArgs := []string{
234234
"--librarian=/librarian",
235235
"--input=/input",
236+
"--repo=/repo",
236237
"--source=/source",
237238
}
238239
generatorInput := filepath.Join(request.RepoDir, config.GeneratorInputDir)
239240
librarianDir := filepath.Join(request.RepoDir, config.LibrarianDir)
240241
mounts := []string{
241242
fmt.Sprintf("%s:/librarian", librarianDir),
242243
fmt.Sprintf("%s:/input", generatorInput),
244+
fmt.Sprintf("%s:/repo", request.RepoDir),
243245
fmt.Sprintf("%s:/source:ro", request.ApiRoot), // readonly volume
244246
}
245247

internal/docker/docker_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,11 +263,13 @@ func TestDockerRun(t *testing.T) {
263263
"run", "--rm",
264264
"-v", fmt.Sprintf("%s/.librarian:/librarian", repoDir),
265265
"-v", fmt.Sprintf("%s/.librarian/generator-input:/input", repoDir),
266+
"-v", fmt.Sprintf("%s:/repo", repoDir),
266267
"-v", fmt.Sprintf("%s:/source:ro", testAPIRoot),
267268
testImage,
268269
string(CommandConfigure),
269270
"--librarian=/librarian",
270271
"--input=/input",
272+
"--repo=/repo",
271273
"--source=/source",
272274
},
273275
},
@@ -321,11 +323,13 @@ func TestDockerRun(t *testing.T) {
321323
"run", "--rm",
322324
"-v", fmt.Sprintf("%s/.librarian:/librarian", repoDir),
323325
"-v", fmt.Sprintf("%s/.librarian/generator-input:/input", repoDir),
326+
"-v", fmt.Sprintf("%s:/repo", repoDir),
324327
"-v", fmt.Sprintf("%s:/source:ro", testAPIRoot),
325328
testImage,
326329
string(CommandConfigure),
327330
"--librarian=/librarian",
328331
"--input=/input",
332+
"--repo=/repo",
329333
"--source=/source",
330334
},
331335
},

testdata/e2e_func.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ const (
1919
inputDir = "input"
2020
librarian = "librarian"
2121
outputDir = "output"
22+
repoDir = "repo"
2223
simulateCommandErrorID = "simulate-command-error-id"
2324
source = "source"
2425
)
@@ -91,6 +92,8 @@ func parseConfigureRequest(args []string) (*configureOption, error) {
9192
configureOption.inputDir = strs[1]
9293
case librarian:
9394
configureOption.librarianDir = strs[1]
95+
case repoDir:
96+
configureOption.repoDir = strs[1]
9497
case source:
9598
configureOption.sourceDir = strs[1]
9699
default:
@@ -256,6 +259,7 @@ func generateLibrary(library *libraryState, outputDir string) error {
256259
type configureOption struct {
257260
inputDir string
258261
librarianDir string
262+
repoDir string
259263
sourceDir string
260264
}
261265

0 commit comments

Comments
 (0)