alt-orchestra/talos
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Rename proto files into more appropriate names

Browse Source 
This is partially driven by the upcoming api changes, but when we tell protoc to look for api.proto,
itll find the first match in the includes(`-I`) directive.

Signed-off-by: Brad Beam <brad.beam@talos-systems.com>
This commit is contained in:
Brad Beam 2019-10-20 14:27:08 -05:00 committed by Brad Beam
parent 462076ad60
commit 5b58d8b7df
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Dockerfile
View File

@ -38,19 +38,19 @@ FROM build AS generate-build
WORKDIR /osd
COPY ./api/os ./proto
# Generate additional grpc functionality only for OSD
RUN protoc -I./proto --plugin=proxy --proxy_out=plugins=grpc+proxy:proto proto/api.proto
RUN protoc -I./proto --plugin=proxy --proxy_out=plugins=grpc+proxy:proto proto/os.proto
WORKDIR /trustd
COPY ./api/security ./proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/api.proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/security.proto
WORKDIR /machined
COPY ./api/machine ./proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/api.proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/machine.proto
WORKDIR /ntpd
COPY ./api/time ./proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/api.proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/time.proto
WORKDIR /networkd
COPY ./api/network ./proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/api.proto
RUN protoc -I./proto --go_out=plugins=grpc:proto proto/network.proto
FROM scratch AS generate

2
api/machine/api.proto → api/machine/machine.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
package proto;
package machineapi;
option go_package = "machineapi";
option java_multiple_files = true;

2
api/network/api.proto → api/network/network.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
package proto;
package networkapi;
option go_package = "networkapi";
option java_multiple_files = true;

2
api/os/api.proto → api/os/os.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
package proto;
package osapi;
option go_package = "osapi";
option java_multiple_files = true;

2
api/security/api.proto → api/security/security.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
package proto;
package securityapi;
option go_package = "securityapi";
option java_multiple_files = true;

2
api/time/api.proto → api/time/time.proto
View File

@ -1,6 +1,6 @@
syntax = "proto3";
package proto;
package timeapi;
option go_package = "timeapi";
option java_multiple_files = true;