Merge pull request #209 from kevinrizza/opm-bundle-generate-dir-struc…

…ture Generalize manifest copy
operator-framework · Mar 6, 2020 · 28958c5 · 28958c5
2 parents 26f160c + 214abef
commit 28958c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/lib/bundle/generate.go b/pkg/lib/bundle/generate.go
@@ -344,7 +344,7 @@ func GenerateDockerfile(mediaType, manifests, metadata, copyManifestDir, copyMet
 	fileContent += fmt.Sprintf("LABEL %s=%s\n\n", ChannelDefaultLabel, chanDefault)
 
 	// CONTENT
-	fileContent += fmt.Sprintf("COPY %s %s\n", filepath.Join(relativeManifestDirectory, "/*.yaml"), "/manifests/")
+	fileContent += fmt.Sprintf("COPY %s %s\n", relativeManifestDirectory, "/manifests/")
 	fileContent += fmt.Sprintf("COPY %s %s%s\n", filepath.Join(relativeMetadataDirectory, AnnotationsFile), "/metadata/", AnnotationsFile)
 
 	return []byte(fileContent), nil

diff --git a/pkg/lib/bundle/generate_test.go b/pkg/lib/bundle/generate_test.go
@@ -208,7 +208,7 @@ func TestGenerateDockerfileFunc(t *testing.T) {
 		"LABEL operators.operatorframework.io.bundle.package.v1=test4\n"+
 		"LABEL operators.operatorframework.io.bundle.channels.v1=test5\n"+
 		"LABEL operators.operatorframework.io.bundle.channel.default.v1=test5\n\n"+
-		"COPY test2/*.yaml /manifests/\n"+
+		"COPY test2 /manifests/\n"+
 		"COPY metadata/annotations.yaml /metadata/annotations.yaml\n", MetadataDir)
 
 	content, err := GenerateDockerfile("test1", "test2", MetadataDir, "test2/", "metadata/", "./", "test4", "test5", "")