diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml index 51992280..8eea84a7 100644 --- a/.github/workflows/dockerimage.yml +++ b/.github/workflows/dockerimage.yml @@ -73,6 +73,7 @@ jobs: GRPC_SWIFT_VERSION=${{ env.GRPC_SWIFT_VERSION }} GRPC_WEB_VERSION=${{ env.GRPC_WEB_VERSION }} NODE_VERSION=${{ env.NODE_VERSION }} + PROTOC_GEN_DART_VERSION=${{ env.PROTOC_GEN_DART_VERSION }} PROTOC_GEN_DOC_VERSION=${{ env.PROTOC_GEN_DOC_VERSION }} PROTOC_GEN_GO_GRPC_VERSION=${{ env.PROTOC_GEN_GO_GRPC_VERSION }} PROTOC_GEN_GO_VERSION=${{ env.PROTOC_GEN_GO_VERSION }} diff --git a/Dockerfile b/Dockerfile index 568b67d2..e466e3ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,19 +10,6 @@ ARG PROTOC_GEN_GOTEMPLATE_VERSION FROM --platform=$BUILDPLATFORM tonistiigi/xx AS xx -FROM alpine:${ALPINE_VERSION} as grpc_web -RUN apk add --no-cache \ - build-base \ - curl \ - protobuf-dev -RUN mkdir -p /grpc-web -ARG GRPC_WEB_VERSION -RUN curl -sSL https://api.github.com/repos/grpc/grpc-web/tarball/${GRPC_WEB_VERSION} | tar xz --strip 1 -C /grpc-web -WORKDIR /grpc-web -RUN make -j$(nproc) install-plugin -RUN install -Ds /usr/local/bin/protoc-gen-grpc-web /out/usr/bin/protoc-gen-grpc-web - - FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-alpine${ALPINE_VERSION} as go_host COPY --from=xx / / WORKDIR / @@ -170,7 +157,20 @@ RUN install -D ./options.proto /out/usr/include/github.com/chrusty/protoc-gen-js RUN xx-verify /out/usr/bin/protoc-gen-jsonschema -FROM rust:${RUST_VERSION}-alpine as rust_target +FROM alpine:${ALPINE_VERSION} as grpc_web +RUN apk add --no-cache \ + build-base \ + curl \ + protobuf-dev +RUN mkdir -p /grpc-web +ARG GRPC_WEB_VERSION +RUN curl -sSL https://api.github.com/repos/grpc/grpc-web/tarball/${GRPC_WEB_VERSION} | tar xz --strip 1 -C /grpc-web +WORKDIR /grpc-web +RUN make -j$(nproc) install-plugin +RUN install -Ds /usr/local/bin/protoc-gen-grpc-web /out/usr/bin/protoc-gen-grpc-web + + +FROM rust:${RUST_VERSION}-alpine${ALPINE_VERSION} as rust_target COPY --from=xx / / WORKDIR / RUN mkdir -p /out @@ -242,23 +242,6 @@ RUN <