Merge pull request #913 from traPtitech/ignore-dockerignore

Commandビルドの場合は.dockerignoreを無視する

pkg/usecase/builder/build_buildkit.go

@@ -24,7 +24,8 @@ import (
 )
 
 const (
-	buildScriptName = "neoshowcase_internal_build.sh"
+	buildScriptName           = "neoshowcase_internal_build.sh"
+	temporaryDockerignoreName = "neoshowcase_temporary_dockerignore"
 )
 
 func withBuildkitProgress(ctx context.Context, logger io.Writer, buildFn func(ctx context.Context, ch chan *buildkit.SolveStatus) error) error {
@@ -86,6 +87,11 @@ func createScriptFile(filename string, script string) error {
 	return createFile(filename, "#!/bin/sh\nset -eux\n"+script)
 }
 
+func dockerignoreExists(dir string) bool {
+	info, err := os.Stat(filepath.Join(dir, ".dockerignore"))
+	return err == nil && !info.IsDir()
+}
+
 func (s *builderService) authSessions() []session.Attachable {
 	if s.imageConfig.Registry.Username == "" && s.imageConfig.Registry.Password == "" {
 		return nil
@@ -139,6 +145,17 @@ func (s *builderService) buildRuntimeCmd(
 	ch chan *buildkit.SolveStatus,
 	bc *domain.BuildConfigRuntimeCmd,
 ) error {
+	// If .dockerignore exists, rename to prevent it from being picked up by buildkitd,
+	// as this is not the behavior we want in 'Command' build which is supposed to execute commands against raw repository files.
+	// See https://github.com/traPtitech/NeoShowcase/issues/877 for more details.
+	dockerignoreExists := dockerignoreExists(st.repositoryTempDir)
+	if dockerignoreExists {
+		err := os.Rename(filepath.Join(st.repositoryTempDir, ".dockerignore"), filepath.Join(st.repositoryTempDir, temporaryDockerignoreName))
+		if err != nil {
+			return errors.Wrap(err, "renaming .dockerignore")
+		}
+	}
+
 	var dockerfile strings.Builder
 	if bc.BaseImage == "" {
 		dockerfile.WriteString("FROM scratch\n")
@@ -153,6 +170,9 @@ func (s *builderService) buildRuntimeCmd(
 
 	dockerfile.WriteString("WORKDIR /srv\n")
 	dockerfile.WriteString("COPY . .\n")
+	if dockerignoreExists {
+		dockerfile.WriteString(fmt.Sprintf("RUN mv %s .dockerignore\n", temporaryDockerignoreName))
+	}
 
 	if bc.BuildCmd != "" {
 		err := createScriptFile(filepath.Join(st.repositoryTempDir, buildScriptName), bc.BuildCmd)
@@ -204,6 +224,17 @@ func (s *builderService) buildStaticCmd(
 	ch chan *buildkit.SolveStatus,
 	bc *domain.BuildConfigStaticCmd,
 ) error {
+	// If .dockerignore exists, rename to prevent it from being picked up by buildkitd,
+	// as this is not the behavior we want in 'Command' build which is supposed to execute commands against raw repository files.
+	// See https://github.com/traPtitech/NeoShowcase/issues/877 for more details.
+	dockerignoreExists := dockerignoreExists(st.repositoryTempDir)
+	if dockerignoreExists {
+		err := os.Rename(filepath.Join(st.repositoryTempDir, ".dockerignore"), filepath.Join(st.repositoryTempDir, temporaryDockerignoreName))
+		if err != nil {
+			return errors.Wrap(err, "renaming .dockerignore")
+		}
+	}
+
 	var dockerfile strings.Builder
 
 	dockerfile.WriteString(fmt.Sprintf(
@@ -218,6 +249,9 @@ func (s *builderService) buildStaticCmd(
 
 	dockerfile.WriteString("WORKDIR /srv\n")
 	dockerfile.WriteString("COPY . .\n")
+	if dockerignoreExists {
+		dockerfile.WriteString(fmt.Sprintf("RUN mv %s .dockerignore\n", temporaryDockerignoreName))
+	}
 
 	if bc.BuildCmd != "" {
 		err := createScriptFile(filepath.Join(st.repositoryTempDir, buildScriptName), bc.BuildCmd)