From 259b4bb5db43f7d738a2a232c9012996acf7ef8f Mon Sep 17 00:00:00 2001 From: "Philip K. Warren" Date: Wed, 12 Jul 2023 12:02:47 -0500 Subject: [PATCH 1/3] Add roadrunner-server php-grpc plugin Fixes #655. --- .../community/roadrunner-server-php-grpc/source.yaml | 4 ++++ .../roadrunner-server-php-grpc/v4.2.0/.dockerignore | 2 ++ .../roadrunner-server-php-grpc/v4.2.0/Dockerfile | 12 ++++++++++++ .../v4.2.0/buf.plugin.yaml | 11 +++++++++++ .../v4.2.0/eliza/plugin.sum | 1 + .../v4.2.0/petapis/plugin.sum | 1 + 6 files changed, 31 insertions(+) create mode 100644 plugins/community/roadrunner-server-php-grpc/source.yaml create mode 100644 plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore create mode 100644 plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile create mode 100644 plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml create mode 100644 tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum create mode 100644 tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum diff --git a/plugins/community/roadrunner-server-php-grpc/source.yaml b/plugins/community/roadrunner-server-php-grpc/source.yaml new file mode 100644 index 000000000..9248b4e0a --- /dev/null +++ b/plugins/community/roadrunner-server-php-grpc/source.yaml @@ -0,0 +1,4 @@ +source: + github: + owner: roadrunner-server + repository: grpc diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore b/plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore new file mode 100644 index 000000000..5d0f124ff --- /dev/null +++ b/plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore @@ -0,0 +1,2 @@ +* +!Dockerfile diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile b/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile new file mode 100644 index 000000000..433c1bd20 --- /dev/null +++ b/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile @@ -0,0 +1,12 @@ +# syntax=docker/dockerfile:1.4 +FROM golang:1.20.6-bullseye AS build +RUN --mount=type=cache,target=/go/pkg/mod \ + git clone --depth=1 --branch=v4.2.0 https://github.com/roadrunner-server/grpc.git \ + && cd grpc/protoc_plugins/protoc-gen-php-grpc \ + && CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=v4.2.0" -trimpath + +FROM scratch +COPY --from=build --link --chown=root:root /etc/passwd /etc/passwd +COPY --from=build --link --chown=root:root /go/grpc/protoc_plugins/protoc-gen-php-grpc/protoc-gen-php-grpc / +USER nobody +ENTRYPOINT [ "/protoc-gen-php-grpc" ] diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml b/plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml new file mode 100644 index 000000000..b15e98bb5 --- /dev/null +++ b/plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml @@ -0,0 +1,11 @@ +version: v1 +name: buf.build/community/roadrunner-server-php-grpc +plugin_version: v4.2.0 +source_url: https://github.com/roadrunner-server/grpc +description: Generates code for the PHP RoadRunner application server. +deps: + - plugin: buf.build/protocolbuffers/php:v23.4 +spdx_license_id: MIT +license_url: https://github.com/roadrunner-server/grpc/blob/v4.2.0/LICENSE +output_languages: + - php diff --git a/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum new file mode 100644 index 000000000..7d13d99b0 --- /dev/null +++ b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum @@ -0,0 +1 @@ +h1:jT7gKL/t3iAPRsfXcC8b24F5IdSxtcuyuhD8yvmGRiA= diff --git a/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum new file mode 100644 index 000000000..fd44421ca --- /dev/null +++ b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum @@ -0,0 +1 @@ +h1:7bA/GKq0K0btx4JnO+NSpYBkPfz0oSLjz+Ddv/NYe/A= From 57c0c773786819a127aaaba30be1c7adc1b8127f Mon Sep 17 00:00:00 2001 From: "Philip K. Warren" Date: Wed, 12 Jul 2023 16:04:56 -0500 Subject: [PATCH 2/3] Update Dockerfile --- plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile b/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile index 433c1bd20..c7e052b80 100644 --- a/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile +++ b/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile @@ -3,7 +3,7 @@ FROM golang:1.20.6-bullseye AS build RUN --mount=type=cache,target=/go/pkg/mod \ git clone --depth=1 --branch=v4.2.0 https://github.com/roadrunner-server/grpc.git \ && cd grpc/protoc_plugins/protoc-gen-php-grpc \ - && CGO_ENABLED=0 go build -ldflags "-s -w -X github.com/roadrunner-server/roadrunner/v2/internal/meta.version=v4.2.0" -trimpath + && CGO_ENABLED=0 go build -ldflags "-s -w" -trimpath FROM scratch COPY --from=build --link --chown=root:root /etc/passwd /etc/passwd From 05b58cf30fa2d0f3c576f3e03e62a0b7290aade1 Mon Sep 17 00:00:00 2001 From: "Philip K. Warren" Date: Wed, 12 Jul 2023 17:07:42 -0500 Subject: [PATCH 3/3] migrate to go install --- .../roadrunner-server-php-grpc/v4.2.0/Dockerfile | 12 ------------ .../{v4.2.0 => v4.3.0}/.dockerignore | 0 .../roadrunner-server-php-grpc/v4.3.0/Dockerfile | 11 +++++++++++ .../{v4.2.0 => v4.3.0}/buf.plugin.yaml | 4 ++-- .../{v4.2.0 => v4.3.0}/eliza/plugin.sum | 0 .../{v4.2.0 => v4.3.0}/petapis/plugin.sum | 0 6 files changed, 13 insertions(+), 14 deletions(-) delete mode 100644 plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile rename plugins/community/roadrunner-server-php-grpc/{v4.2.0 => v4.3.0}/.dockerignore (100%) create mode 100644 plugins/community/roadrunner-server-php-grpc/v4.3.0/Dockerfile rename plugins/community/roadrunner-server-php-grpc/{v4.2.0 => v4.3.0}/buf.plugin.yaml (77%) rename tests/testdata/buf.build/community/roadrunner-server-php-grpc/{v4.2.0 => v4.3.0}/eliza/plugin.sum (100%) rename tests/testdata/buf.build/community/roadrunner-server-php-grpc/{v4.2.0 => v4.3.0}/petapis/plugin.sum (100%) diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile b/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile deleted file mode 100644 index c7e052b80..000000000 --- a/plugins/community/roadrunner-server-php-grpc/v4.2.0/Dockerfile +++ /dev/null @@ -1,12 +0,0 @@ -# syntax=docker/dockerfile:1.4 -FROM golang:1.20.6-bullseye AS build -RUN --mount=type=cache,target=/go/pkg/mod \ - git clone --depth=1 --branch=v4.2.0 https://github.com/roadrunner-server/grpc.git \ - && cd grpc/protoc_plugins/protoc-gen-php-grpc \ - && CGO_ENABLED=0 go build -ldflags "-s -w" -trimpath - -FROM scratch -COPY --from=build --link --chown=root:root /etc/passwd /etc/passwd -COPY --from=build --link --chown=root:root /go/grpc/protoc_plugins/protoc-gen-php-grpc/protoc-gen-php-grpc / -USER nobody -ENTRYPOINT [ "/protoc-gen-php-grpc" ] diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore b/plugins/community/roadrunner-server-php-grpc/v4.3.0/.dockerignore similarity index 100% rename from plugins/community/roadrunner-server-php-grpc/v4.2.0/.dockerignore rename to plugins/community/roadrunner-server-php-grpc/v4.3.0/.dockerignore diff --git a/plugins/community/roadrunner-server-php-grpc/v4.3.0/Dockerfile b/plugins/community/roadrunner-server-php-grpc/v4.3.0/Dockerfile new file mode 100644 index 000000000..ef8513af9 --- /dev/null +++ b/plugins/community/roadrunner-server-php-grpc/v4.3.0/Dockerfile @@ -0,0 +1,11 @@ +# syntax=docker/dockerfile:1.4 +FROM golang:1.20.6-bullseye AS build +RUN --mount=type=cache,target=/go/pkg/mod \ + CGO_ENABLED=0 \ + go install -ldflags="-s -w" -trimpath github.com/roadrunner-server/grpc/protoc_plugins/v4/protoc-gen-php-grpc@v4.3.0 + +FROM scratch +COPY --from=build --link --chown=root:root /etc/passwd /etc/passwd +COPY --from=build --link --chown=root:root /go/bin/protoc-gen-php-grpc / +USER nobody +ENTRYPOINT [ "/protoc-gen-php-grpc" ] diff --git a/plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml b/plugins/community/roadrunner-server-php-grpc/v4.3.0/buf.plugin.yaml similarity index 77% rename from plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml rename to plugins/community/roadrunner-server-php-grpc/v4.3.0/buf.plugin.yaml index b15e98bb5..a90f6c992 100644 --- a/plugins/community/roadrunner-server-php-grpc/v4.2.0/buf.plugin.yaml +++ b/plugins/community/roadrunner-server-php-grpc/v4.3.0/buf.plugin.yaml @@ -1,11 +1,11 @@ version: v1 name: buf.build/community/roadrunner-server-php-grpc -plugin_version: v4.2.0 +plugin_version: v4.3.0 source_url: https://github.com/roadrunner-server/grpc description: Generates code for the PHP RoadRunner application server. deps: - plugin: buf.build/protocolbuffers/php:v23.4 spdx_license_id: MIT -license_url: https://github.com/roadrunner-server/grpc/blob/v4.2.0/LICENSE +license_url: https://github.com/roadrunner-server/grpc/blob/v4.3.0/LICENSE output_languages: - php diff --git a/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.3.0/eliza/plugin.sum similarity index 100% rename from tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/eliza/plugin.sum rename to tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.3.0/eliza/plugin.sum diff --git a/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum b/tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.3.0/petapis/plugin.sum similarity index 100% rename from tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.2.0/petapis/plugin.sum rename to tests/testdata/buf.build/community/roadrunner-server-php-grpc/v4.3.0/petapis/plugin.sum