Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit dcd1e30

Browse files
committed
Fix protos target to update new protos folder
Signed-off-by: Guillaume Tardif <[email protected]>
1 parent 6859413 commit dcd1e30

File tree

8 files changed

+842
-842
lines changed

8 files changed

+842
-842
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ RUN --mount=target=. \
8787
make BINARY=/out/docker -f builder.Makefile cross
8888

8989
FROM scratch AS protos
90-
COPY --from=make-protos /compose-cli/protos .
90+
COPY --from=make-protos /compose-cli/cli/server/protos .
9191

9292
FROM scratch AS cli
9393
COPY --from=make-cli /out/* .

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ all: cli
3434

3535
protos: ## Generate go code from .proto files
3636
@docker build . --target protos \
37-
--output ./protos
37+
--output ./cli/server/protos
3838

3939
cli: ## Compile the cli
4040
@docker build . --target cli \

builder.Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ GOARCH?=$(shell go env GOARCH)
1717

1818
PKG_NAME := github.com/docker/compose-cli
1919

20-
PROTOS=$(shell find protos -name \*.proto)
20+
PROTOS=$(shell find cli/server/protos -name \*.proto)
2121

2222
EXTENSION:=
2323
ifeq ($(GOOS),windows)

cli/server/protos/compose/v1/compose.pb.go

Lines changed: 155 additions & 155 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/server/protos/containers/v1/containers.pb.go

Lines changed: 325 additions & 325 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/server/protos/contexts/v1/contexts.pb.go

Lines changed: 132 additions & 132 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/server/protos/streams/v1/streams.pb.go

Lines changed: 76 additions & 76 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cli/server/protos/volumes/v1/volumes.pb.go

Lines changed: 151 additions & 151 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)