Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| a69ed648f9 | |||
| 1405424ded | |||
| 62eecc5240 |
13
Makefile
13
Makefile
@@ -1,6 +1,8 @@
|
|||||||
.PHONY: build test vet lint proto proto-lint clean docker all devserver
|
.PHONY: build test vet lint proto proto-lint clean docker push all devserver
|
||||||
|
|
||||||
LDFLAGS := -trimpath -ldflags="-s -w -X main.version=$(shell git describe --tags --always --dirty)"
|
MCR := mcr.svc.mcp.metacircular.net:8443
|
||||||
|
VERSION := $(shell git describe --tags --always --dirty)
|
||||||
|
LDFLAGS := -trimpath -ldflags="-s -w -X main.version=$(VERSION)"
|
||||||
|
|
||||||
mcrsrv:
|
mcrsrv:
|
||||||
CGO_ENABLED=0 go build $(LDFLAGS) -o mcrsrv ./cmd/mcrsrv
|
CGO_ENABLED=0 go build $(LDFLAGS) -o mcrsrv ./cmd/mcrsrv
|
||||||
@@ -36,7 +38,12 @@ clean:
|
|||||||
rm -f mcrsrv mcr-web mcrctl
|
rm -f mcrsrv mcr-web mcrctl
|
||||||
|
|
||||||
docker:
|
docker:
|
||||||
docker build --build-arg VERSION=$(shell git describe --tags --always --dirty) -t mcr -f Dockerfile .
|
docker build --build-arg VERSION=$(VERSION) -t $(MCR)/mcr:$(VERSION) -f Dockerfile.api .
|
||||||
|
docker build --build-arg VERSION=$(VERSION) -t $(MCR)/mcr-web:$(VERSION) -f Dockerfile.web .
|
||||||
|
|
||||||
|
push: docker
|
||||||
|
docker push $(MCR)/mcr:$(VERSION)
|
||||||
|
docker push $(MCR)/mcr-web:$(VERSION)
|
||||||
|
|
||||||
devserver: mcrsrv
|
devserver: mcrsrv
|
||||||
@mkdir -p srv
|
@mkdir -p srv
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
pkgs = nixpkgs.legacyPackages.${system};
|
||||||
version = "0.1.0";
|
version = "1.2.0";
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
packages.${system} = {
|
packages.${system} = {
|
||||||
|
|||||||
@@ -110,7 +110,7 @@ const file_mcr_v1_admin_proto_rawDesc = "" +
|
|||||||
"\x0eHealthResponse\x12\x16\n" +
|
"\x0eHealthResponse\x12\x16\n" +
|
||||||
"\x06status\x18\x01 \x01(\tR\x06status2G\n" +
|
"\x06status\x18\x01 \x01(\tR\x06status2G\n" +
|
||||||
"\fAdminService\x127\n" +
|
"\fAdminService\x127\n" +
|
||||||
"\x06Health\x12\x15.mcr.v1.HealthRequest\x1a\x16.mcr.v1.HealthResponseB,Z*git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
"\x06Health\x12\x15.mcr.v1.HealthRequest\x1a\x16.mcr.v1.HealthResponseB*Z(git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcr_v1_admin_proto_rawDescOnce sync.Once
|
file_mcr_v1_admin_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -287,7 +287,7 @@ const file_mcr_v1_audit_proto_rawDesc = "" +
|
|||||||
"\x17ListAuditEventsResponse\x12*\n" +
|
"\x17ListAuditEventsResponse\x12*\n" +
|
||||||
"\x06events\x18\x01 \x03(\v2\x12.mcr.v1.AuditEventR\x06events2b\n" +
|
"\x06events\x18\x01 \x03(\v2\x12.mcr.v1.AuditEventR\x06events2b\n" +
|
||||||
"\fAuditService\x12R\n" +
|
"\fAuditService\x12R\n" +
|
||||||
"\x0fListAuditEvents\x12\x1e.mcr.v1.ListAuditEventsRequest\x1a\x1f.mcr.v1.ListAuditEventsResponseB,Z*git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
"\x0fListAuditEvents\x12\x1e.mcr.v1.ListAuditEventsRequest\x1a\x1f.mcr.v1.ListAuditEventsResponseB*Z(git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcr_v1_audit_proto_rawDescOnce sync.Once
|
file_mcr_v1_audit_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -81,7 +81,7 @@ const file_mcr_v1_common_proto_rawDesc = "" +
|
|||||||
"\x13mcr/v1/common.proto\x12\x06mcr.v1\"A\n" +
|
"\x13mcr/v1/common.proto\x12\x06mcr.v1\"A\n" +
|
||||||
"\x11PaginationRequest\x12\x14\n" +
|
"\x11PaginationRequest\x12\x14\n" +
|
||||||
"\x05limit\x18\x01 \x01(\x05R\x05limit\x12\x16\n" +
|
"\x05limit\x18\x01 \x01(\x05R\x05limit\x12\x16\n" +
|
||||||
"\x06offset\x18\x02 \x01(\x05R\x06offsetB,Z*git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
"\x06offset\x18\x02 \x01(\x05R\x06offsetB*Z(git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcr_v1_common_proto_rawDescOnce sync.Once
|
file_mcr_v1_common_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -670,7 +670,7 @@ const file_mcr_v1_policy_proto_rawDesc = "" +
|
|||||||
"\x10CreatePolicyRule\x12\x1f.mcr.v1.CreatePolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12A\n" +
|
"\x10CreatePolicyRule\x12\x1f.mcr.v1.CreatePolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12A\n" +
|
||||||
"\rGetPolicyRule\x12\x1c.mcr.v1.GetPolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12G\n" +
|
"\rGetPolicyRule\x12\x1c.mcr.v1.GetPolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12G\n" +
|
||||||
"\x10UpdatePolicyRule\x12\x1f.mcr.v1.UpdatePolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12U\n" +
|
"\x10UpdatePolicyRule\x12\x1f.mcr.v1.UpdatePolicyRuleRequest\x1a\x12.mcr.v1.PolicyRule\x12U\n" +
|
||||||
"\x10DeletePolicyRule\x12\x1f.mcr.v1.DeletePolicyRuleRequest\x1a .mcr.v1.DeletePolicyRuleResponseB,Z*git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
"\x10DeletePolicyRule\x12\x1f.mcr.v1.DeletePolicyRuleRequest\x1a .mcr.v1.DeletePolicyRuleResponseB*Z(git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcr_v1_policy_proto_rawDescOnce sync.Once
|
file_mcr_v1_policy_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
@@ -812,7 +812,7 @@ const file_mcr_v1_registry_proto_rawDesc = "" +
|
|||||||
"\rGetRepository\x12\x1c.mcr.v1.GetRepositoryRequest\x1a\x1d.mcr.v1.GetRepositoryResponse\x12U\n" +
|
"\rGetRepository\x12\x1c.mcr.v1.GetRepositoryRequest\x1a\x1d.mcr.v1.GetRepositoryResponse\x12U\n" +
|
||||||
"\x10DeleteRepository\x12\x1f.mcr.v1.DeleteRepositoryRequest\x1a .mcr.v1.DeleteRepositoryResponse\x12O\n" +
|
"\x10DeleteRepository\x12\x1f.mcr.v1.DeleteRepositoryRequest\x1a .mcr.v1.DeleteRepositoryResponse\x12O\n" +
|
||||||
"\x0eGarbageCollect\x12\x1d.mcr.v1.GarbageCollectRequest\x1a\x1e.mcr.v1.GarbageCollectResponse\x12F\n" +
|
"\x0eGarbageCollect\x12\x1d.mcr.v1.GarbageCollectRequest\x1a\x1e.mcr.v1.GarbageCollectResponse\x12F\n" +
|
||||||
"\vGetGCStatus\x12\x1a.mcr.v1.GetGCStatusRequest\x1a\x1b.mcr.v1.GetGCStatusResponseB,Z*git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
"\vGetGCStatus\x12\x1a.mcr.v1.GetGCStatusRequest\x1a\x1b.mcr.v1.GetGCStatusResponseB*Z(git.wntrmute.dev/mc/mcr/gen/mcr/v1;mcrv1b\x06proto3"
|
||||||
|
|
||||||
var (
|
var (
|
||||||
file_mcr_v1_registry_proto_rawDescOnce sync.Once
|
file_mcr_v1_registry_proto_rawDescOnce sync.Once
|
||||||
|
|||||||
Reference in New Issue
Block a user