Remove warning about .mesgingnore close #494

api/deploy_test.go

@@ -46,11 +46,6 @@ func TestDeployService(t *testing.T) {
 		Type:    DonePositive,
 	}, <-statuses)
 
-	require.Equal(t, DeployStatus{
-		Message: "[DEPRECATED] Please use .dockerignore instead of .mesgignore",
-		Type:    DoneNegative,
-	}, <-statuses)
-
 	require.Equal(t, DeployStatus{
 		Message: "Building Docker image...",
 		Type:    Running,

container/build.go

@@ -6,10 +6,12 @@ import (
 	"errors"
 	"fmt"
 	"io/ioutil"
+	"os"
 	"path/filepath"
 	"strings"
 
 	"github.com/docker/docker/api/types"
+	"github.com/docker/docker/builder/dockerignore"
 	"github.com/docker/docker/pkg/archive"
 )
 
@@ -21,12 +23,11 @@ type BuildResponse struct {
 
 // Build builds a docker image.
 func (c *Container) Build(path string) (tag string, err error) {
-	excludeFiles := []string{}
-	// TODO: remove .mesgignore for a future release
-	for _, file := range []string{".mesgignore", ".dockerignore"} {
-		excludeFilesBytes, _ := ioutil.ReadFile(filepath.Join(path, file))
-		excludeFiles = append(excludeFiles, strings.Fields(string(excludeFilesBytes))...)
+	excludeFiles, err := dockerignoreFiles(path)
+	if err != nil {
+		return "", err
 	}
+
 	buildContext, err := archive.TarWithOptions(path, &archive.TarOptions{
 		Compression:     archive.Gzip,
 		ExcludePatterns: excludeFiles,
@@ -46,6 +47,19 @@ func (c *Container) Build(path string) (tag string, err error) {
 	return parseBuildResponse(response)
 }
 
+// dockerignoreFiles reads exlcuded files from .dockerignore.
+func dockerignoreFiles(path string) ([]string, error) {
+	f, err := os.Open(filepath.Join(path, ".dockerignore"))
+	if err != nil {
+		if os.IsNotExist(err) {
+			return nil, nil
+		}
+		return nil, err
+	}
+	defer f.Close()
+	return dockerignore.ReadAll(f)
+}
+
 func parseBuildResponse(response types.ImageBuildResponse) (tag string, err error) {
 	lastOutput, err := extractLastOutputFromBuildResponse(response)
 	if err != nil {

service/service.go

@@ -6,7 +6,6 @@ import (
 	"io"
 	"io/ioutil"
 	"os"
-	"path/filepath"
 	"time"
 
 	"github.com/cnf/structhash"
@@ -95,9 +94,6 @@ func New(tarball io.Reader, options ...Option) (*Service, error) {
 	if err := s.saveContext(tarball); err != nil {
 		return nil, err
 	}
-	if err := s.checkDeprecations(); err != nil {
-		return nil, err
-	}
 
 	def, err := importer.From(s.tempPath)
 	if err != nil {
@@ -220,15 +216,6 @@ func (s *Service) deploy() error {
 	return nil
 }
 
-// checkDeprecations checks deprecated usages in service.
-func (s *Service) checkDeprecations() error {
-	if _, err := os.Stat(filepath.Join(s.tempPath, ".mesgignore")); err == nil {
-		// TODO: remove for a future release
-		s.sendStatus("[DEPRECATED] Please use .dockerignore instead of .mesgignore", DDoneNegative)
-	}
-	return nil
-}
-
 // sendStatus sends a status message.
 func (s *Service) sendStatus(message string, typ DStatusType) {
 	if s.statuses != nil {