frantjc/grpc

Dockerfile

@@ -16,18 +16,19 @@ ARG prerelease=
 ARG commit=
 ARG repository=frantjc/sequence
 ARG tag=latest
+RUN go build -ldflags "-s -w -X github.com/frantjc/sequence/meta.Version=${version} -X github.com/frantjc/sequence/meta.Prerelease=${prerelease} -X github.com/frantjc/sequence/meta.Build=${commit} -X github.com/frantjc/sequence/meta.Repository=${repository} -X github.com/frantjc/sequence/meta.Tag=${tag} -X github.com/frantjc/sequence/meta.Digest=${digest}" -o /usr/local/bin ./cmd/sequence
 RUN go build -ldflags "-s -w -X github.com/frantjc/sequence/meta.Version=${version} -X github.com/frantjc/sequence/meta.Prerelease=${prerelease} -X github.com/frantjc/sequence/meta.Build=${commit} -X github.com/frantjc/sequence/meta.Repository=${repository} -X github.com/frantjc/sequence/meta.Tag=${tag} -X github.com/frantjc/sequence/meta.Digest=${digest}" -o /usr/local/bin ./cmd/sqnc
+RUN go build -ldflags "-s -w -X github.com/frantjc/sequence/meta.Version=${version} -X github.com/frantjc/sequence/meta.Prerelease=${prerelease} -X github.com/frantjc/sequence/meta.Build=${commit} -X github.com/frantjc/sequence/meta.Repository=${repository} -X github.com/frantjc/sequence/meta.Tag=${tag} -X github.com/frantjc/sequence/meta.Digest=${digest}" -o /usr/local/bin ./cmd/sqncshim
 RUN set -e; for pkg in $(go list ./...); do \
 		go test -ldflags "-s -w -X github.com/frantjc/sequence/meta.Version=${version} -X github.com/frantjc/sequence/meta.Prerelease=${prerelease} -X github.com/frantjc/sequence/meta.Build=${commit} -X github.com/frantjc/sequence/meta.Repository=${repository} -X github.com/frantjc/sequence/meta.Tag=${tag} -X github.com/frantjc/sequence/meta.Digest=${digest}" -o /usr/local/test/bin/$(basename $pkg).test -c $pkg; \
 	done
 
 FROM base AS sequence
-COPY --from=bin /usr/local/bin/sqnc /usr/local/bin
-ENTRYPOINT ["sqnc"]
+COPY --from=bin /usr/local/bin /usr/local/bin
+ENTRYPOINT ["sequence"]
 
 FROM sequence AS test
 COPY --from=bin /usr/local/test/bin /usr/local/test/bin
-ARG SQNC_E2E
 RUN set -e; for test in /usr/local/test/bin/*.test; do \
 		$test; \
 	done

Makefile

@@ -12,25 +12,28 @@ REPOSITORY ?= frantjc/sequence
 MODULE ?= github.com/$(REPOSITORY)
 TAG ?= latest
 
-E2E ?= yes
-
 DOCKER ?= docker
 
-BUILD_ARGS ?= --build-arg repository=$(REPOSITORY) --build-arg SQNC_E2E=$(E2E) --build-arg tag=$(TAG) --build-arg commit=$(COMMIT)
+BUILD_ARGS ?= --build-arg repository=$(REPOSITORY) --build-arg tag=$(TAG) --build-arg commit=$(COMMIT)
+
+PROTOS ?= $(shell find . -type f -name *.proto)
+PROTOC_ARGS ?= --go_out=. --go_opt=paths=source_relative --go-grpc_out=. --go-grpc_opt=paths=source_relative
+
+INSTALL ?= sudo install
 
 .DEFAULT: sqnc
 
-sqnc:
+sequence sqnc sqncshim:
 	$(GO) build -ldflags "-s -w -X github.com/frantjc/sequence/meta.Build=$(COMMIT) -X github.com/frantjc/sequence/meta.Repository=$(REPOSITORY) -X github.com/frantjc/sequence/meta.Tag=$(TAG)" -o ./bin $(CURDIR)/cmd/$@
-	sudo install $(CURDIR)/bin/$@ $(BIN)
+	$(INSTALL) $(CURDIR)/bin/$@ $(BIN)
 
 image img: 
 	$(DOCKER) build -t $(REGISTRY)/$(REPOSITORY):$(TAG) $(BUILD_ARGS) .
 
 test: image
 	$(DOCKER) build -t $(REGISTRY)/$(REPOSITORY):test $(BUILD_ARGS) --target=test .
 
-bin bins binaries: sqnc
+bin bins binaries: sequence sqnc
 
 fmt lint pretty:
 	$(GO) fmt ./...
@@ -47,4 +50,7 @@ clean:
 	rm -rf bin/* vendor
 	docker system prune --volumes -a --filter label=sequence=true
 
-.PHONY: sqnc image img test bin bins binaries fmt lint pretty vet vendor clean
+protos:
+	protoc $(PROTOC_ARGS) $(PROTOS)
+
+.PHONY: sequence sqnc image img test bin bins binaries fmt lint pretty vet vendor clean protos

api/doc.go

@@ -0,0 +1 @@
+package api

api/types/doc.go

@@ -0,0 +1 @@
+package types

api/types/job.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+
+package sequence.types;
+
+import "api/types/step.proto";
+
+option go_package = "github.com/frantjc/sequence/api/types";
+
+message Job {
+    repeated sequence.types.Step steps = 1;
+}

api/types/log.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package sequence.types;
+
+option go_package = "github.com/frantjc/sequence/api/types";
+
+message Log {
+	string line = 1;
+}