Merge pull request #5048 from camilamacedo86/improve-dockerignore

🐛 (go/v4): Fix Docker builds failing when projects don’t include apis/, controllers/, or webhooks by updating .dockerignore to allow only Go source files and module metadata

Author: k8s-ci-robot

docs/book/src/cronjob-tutorial/testdata/project/.dockerignore

@@ -1,3 +1,11 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
+# Ignore everything by default and re-include only needed files
+**
+
+# Re-include Go source files (but not *_test.go)
+!**/*.go
+**/*_test.go
+
+# Re-include Go module files
+!go.mod
+!go.sum

docs/book/src/cronjob-tutorial/testdata/project/Dockerfile

@@ -11,10 +11,8 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source
-COPY cmd/main.go cmd/main.go
-COPY api/ api/
-COPY internal/ internal/
+# Copy the Go source (relies on .dockerignore to filter)
+COPY . .
 
 # Build
 # the GOARCH has no default value to allow the binary to be built according to the host where the command

docs/book/src/getting-started/testdata/project/.dockerignore

@@ -1,3 +1,11 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
+# Ignore everything by default and re-include only needed files
+**
+
+# Re-include Go source files (but not *_test.go)
+!**/*.go
+**/*_test.go
+
+# Re-include Go module files
+!go.mod
+!go.sum

docs/book/src/getting-started/testdata/project/Dockerfile

@@ -11,10 +11,8 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source
-COPY cmd/main.go cmd/main.go
-COPY api/ api/
-COPY internal/ internal/
+# Copy the Go source (relies on .dockerignore to filter)
+COPY . .
 
 # Build
 # the GOARCH has no default value to allow the binary to be built according to the host where the command

docs/book/src/multiversion-tutorial/testdata/project/.dockerignore

@@ -1,3 +1,11 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
+# Ignore everything by default and re-include only needed files
+**
+
+# Re-include Go source files (but not *_test.go)
+!**/*.go
+**/*_test.go
+
+# Re-include Go module files
+!go.mod
+!go.sum

docs/book/src/multiversion-tutorial/testdata/project/Dockerfile

@@ -11,10 +11,8 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source
-COPY cmd/main.go cmd/main.go
-COPY api/ api/
-COPY internal/ internal/
+# Copy the Go source (relies on .dockerignore to filter)
+COPY . .
 
 # Build
 # the GOARCH has no default value to allow the binary to be built according to the host where the command

pkg/plugins/golang/v4/scaffolds/internal/templates/dockerfile.go

@@ -51,10 +51,8 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source
-COPY cmd/main.go cmd/main.go
-COPY api/ api/
-COPY internal/ internal/
+# Copy the Go source (relies on .dockerignore to filter)
+COPY . .
 
 # Build
 # the GOARCH has no default value to allow the binary to be built according to the host where the command

pkg/plugins/golang/v4/scaffolds/internal/templates/dockerignore.go

@@ -39,6 +39,14 @@ func (f *DockerIgnore) SetTemplateDefaults() error {
 }
 
 const dockerignorefileTemplate = `# More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
+# Ignore everything by default and re-include only needed files
+**
+
+# Re-include Go source files (but not *_test.go)
+!**/*.go
+**/*_test.go
+
+# Re-include Go module files
+!go.mod
+!go.sum
 `

testdata/project-v4-multigroup/.dockerignore

@@ -1,3 +1,11 @@
 # More info: https://docs.docker.com/engine/reference/builder/#dockerignore-file
-# Ignore build and test binaries.
-bin/
+# Ignore everything by default and re-include only needed files
+**
+
+# Re-include Go source files (but not *_test.go)
+!**/*.go
+**/*_test.go
+
+# Re-include Go module files
+!go.mod
+!go.sum

testdata/project-v4-multigroup/Dockerfile

@@ -11,10 +11,8 @@ COPY go.sum go.sum
 # and so that source changes don't invalidate our downloaded layer
 RUN go mod download
 
-# Copy the go source
-COPY cmd/main.go cmd/main.go
-COPY api/ api/
-COPY internal/ internal/
+# Copy the Go source (relies on .dockerignore to filter)
+COPY . .
 
 # Build
 # the GOARCH has no default value to allow the binary to be built according to the host where the command