mirror of https://github.com/docker/compose.git
Remove build flag for local backend
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
This commit is contained in:
parent
a6316a90c7
commit
6fc8eefb1b
|
@ -60,12 +60,12 @@ jobs:
|
||||||
|
|
||||||
- name: Test
|
- name: Test
|
||||||
env:
|
env:
|
||||||
BUILD_TAGS: example,local
|
BUILD_TAGS: example
|
||||||
run: make -f builder.Makefile test
|
run: make -f builder.Makefile test
|
||||||
|
|
||||||
- name: Build for local E2E
|
- name: Build for local E2E
|
||||||
env:
|
env:
|
||||||
BUILD_TAGS: example,local,e2e
|
BUILD_TAGS: example,e2e
|
||||||
run: make -f builder.Makefile cli
|
run: make -f builder.Makefile cli
|
||||||
|
|
||||||
- name: E2E Test
|
- name: E2E Test
|
||||||
|
|
6
Makefile
6
Makefile
|
@ -39,7 +39,7 @@ protos: ## Generate go code from .proto files
|
||||||
cli: ## Compile the cli
|
cli: ## Compile the cli
|
||||||
@docker build . --target cli \
|
@docker build . --target cli \
|
||||||
--platform local \
|
--platform local \
|
||||||
--build-arg BUILD_TAGS=example,local,e2e \
|
--build-arg BUILD_TAGS=example,e2e \
|
||||||
--build-arg GIT_TAG=$(GIT_TAG) \
|
--build-arg GIT_TAG=$(GIT_TAG) \
|
||||||
--output ./bin
|
--output ./bin
|
||||||
|
|
||||||
|
@ -63,7 +63,7 @@ cross: ## Compile the CLI for linux, darwin and windows
|
||||||
|
|
||||||
test: ## Run unit tests
|
test: ## Run unit tests
|
||||||
@docker build . \
|
@docker build . \
|
||||||
--build-arg BUILD_TAGS=example,local \
|
--build-arg BUILD_TAGS=example \
|
||||||
--build-arg GIT_TAG=$(GIT_TAG) \
|
--build-arg GIT_TAG=$(GIT_TAG) \
|
||||||
--target test
|
--target test
|
||||||
|
|
||||||
|
@ -72,7 +72,7 @@ cache-clear: ## Clear the builder cache
|
||||||
|
|
||||||
lint: ## run linter(s)
|
lint: ## run linter(s)
|
||||||
@docker build . \
|
@docker build . \
|
||||||
--build-arg BUILD_TAGS=example,local,e2e \
|
--build-arg BUILD_TAGS=example,e2e \
|
||||||
--build-arg GIT_TAG=$(GIT_TAG) \
|
--build-arg GIT_TAG=$(GIT_TAG) \
|
||||||
--target lint
|
--target lint
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
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 {
|
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{
|
containers, err := s.apiClient.ContainerList(ctx, moby.ContainerListOptions{
|
||||||
Filters: filter,
|
Filters: filter,
|
||||||
All: true,
|
All: true,
|
||||||
})
|
})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,3 @@
|
||||||
// +build local
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Copyright 2020 Docker Compose CLI authors
|
Copyright 2020 Docker Compose CLI authors
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue