소스 검색

Remove build flag for local backend

Signed-off-by: Guillaume Tardif <[email protected]>
Guillaume Tardif 5 년 전
부모
커밋
6fc8eefb1b
16개의 변경된 파일6개의 추가작업 그리고 34개의 파일을 삭제
  1. 2 2
      .github/workflows/ci.yml
  2. 3 3
      Makefile
  3. 0 2
      local/backend.go
  4. 0 2
      local/build.go
  5. 1 3
      local/compose.go
  6. 0 2
      local/compose_test.go
  7. 0 2
      local/container.go
  8. 0 2
      local/containers.go
  9. 0 2
      local/convergence.go
  10. 0 2
      local/convert.go
  11. 0 2
      local/convert_test.go
  12. 0 2
      local/dependencies.go
  13. 0 2
      local/dependencies_test.go
  14. 0 2
      local/labels.go
  15. 0 2
      local/util.go
  16. 0 2
      local/volumes.go

+ 2 - 2
.github/workflows/ci.yml

@@ -60,12 +60,12 @@ jobs:
 
       - name: Test
         env:
-          BUILD_TAGS: example,local
+          BUILD_TAGS: example
         run: make -f builder.Makefile test
 
       - name: Build for local E2E
         env:
-          BUILD_TAGS: example,local,e2e
+          BUILD_TAGS: example,e2e
         run: make -f builder.Makefile cli
 
       - name: E2E Test

+ 3 - 3
Makefile

@@ -39,7 +39,7 @@ protos: ## Generate go code from .proto files
 cli: ## Compile the cli
 	@docker build . --target cli \
 	--platform local \
-	--build-arg BUILD_TAGS=example,local,e2e \
+	--build-arg BUILD_TAGS=example,e2e \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--output ./bin
 
@@ -63,7 +63,7 @@ cross: ## Compile the CLI for linux, darwin and windows
 
 test: ## Run unit tests
 	@docker build . \
-	--build-arg BUILD_TAGS=example,local \
+	--build-arg BUILD_TAGS=example \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--target test
 
@@ -72,7 +72,7 @@ cache-clear: ## Clear the builder cache
 
 lint: ## run linter(s)
 	@docker build . \
-	--build-arg BUILD_TAGS=example,local,e2e \
+	--build-arg BUILD_TAGS=example,e2e \
 	--build-arg GIT_TAG=$(GIT_TAG) \
 	--target lint
 

+ 0 - 2
local/backend.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/build.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 1 - 3
local/compose.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 
@@ -502,7 +500,7 @@ func (s *composeService) Down(ctx context.Context, projectName string) error {
 func (s *composeService) removeContainers(ctx context.Context, w progress.Writer, eg *errgroup.Group, filter filters.Args) error {
 	containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
 		Filters: filter,
-		All: true,
+		All:     true,
 	})
 	if err != nil {
 		return err

+ 0 - 2
local/compose_test.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/container.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/containers.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/convergence.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/convert.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/convert_test.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/dependencies.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/dependencies_test.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/labels.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/util.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors
 

+ 0 - 2
local/volumes.go

@@ -1,5 +1,3 @@
-// +build local
-
 /*
    Copyright 2020 Docker Compose CLI authors