Skip to content

Commit

Permalink
wip: alpine 3.19 update
Browse files Browse the repository at this point in the history
  • Loading branch information
strophy committed Apr 17, 2024
1 parent ae692f5 commit 56d0c13
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 14 deletions.
22 changes: 13 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ 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
# 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 rust:${RUST_IMAGE_VERSION} as rust_target
Expand Down Expand Up @@ -370,6 +370,7 @@ WORKDIR /scala-protobuf
RUN gu install native-image
# Make sbt use the version of native-image installed by gu instead of downloading a separate version
ARG NATIVE_IMAGE_INSTALLED=true
# RUN chmod +x $JAVA_HOME/lib/jspawnhelper
RUN ./make_reflect_config.sh
RUN sbt protocGenScalaNativeImage/nativeImage
RUN install -D /scala-protobuf/target/protoc-gen-scala /out/usr/bin/protoc-gen-scala
Expand Down Expand Up @@ -398,7 +399,7 @@ COPY --from=googleapis /out/ /out/
COPY --from=grpc_gateway /out/ /out/
COPY --from=grpc_rust /out/ /out/
COPY --from=grpc_swift /protoc-gen-swift /out/protoc-gen-swift
COPY --from=grpc_web /out/ /out/
# COPY --from=grpc_web /out/ /out/
COPY --from=protoc_gen_doc /out/ /out/
COPY --from=protoc_gen_go /out/ /out/
COPY --from=protoc_gen_go_grpc /out/ /out/
Expand Down Expand Up @@ -427,17 +428,20 @@ ARG PROTOC_GEN_NANOPB_VERSION
RUN apk add --no-cache \
bash \
grpc \
grpc-java \
# grpc-java \
grpc-plugins \
pipx \
protobuf \
protobuf-dev \
protobuf-c-compiler \
python3
python3 \
rm -rf ~/.cache/* /usr/local/share/man /tmp/*
COPY --from=upx /out/ /
COPY --from=protoc_gen_ts /out/ /
COPY --from=protoc_gen_dart /out/ /
COPY --from=protoc_gen_dart /runtime/ /
RUN python3 -m ensurepip && pip3 install --no-cache nanopb==${PROTOC_GEN_NANOPB_VERSION}
ENV PATH="${PATH}:/root/.local/bin"
RUN pipx install nanopb==${PROTOC_GEN_NANOPB_VERSION}
RUN ln -s /usr/bin/grpc_cpp_plugin /usr/bin/protoc-gen-grpc-cpp && \
ln -s /usr/bin/grpc_csharp_plugin /usr/bin/protoc-gen-grpc-csharp && \
ln -s /usr/bin/grpc_node_plugin /usr/bin/protoc-gen-grpc-js && \
Expand All @@ -460,22 +464,22 @@ RUN mkdir -p /test && \
--grpc-cpp_out=/test \
--grpc-csharp_out=/test \
--grpc-go_out=/test \
--grpc-java_out=/test \
# --grpc-java_out=/test \
--grpc-js_out=/test \
--grpc-objc_out=/test \
--grpc-php_out=/test \
--grpc-python_out=/test \
--grpc-ruby_out=/test \
--grpc-rust_out=/test \
--grpc-web_out=import_style=commonjs,mode=grpcwebtext:/test \
# --grpc-web_out=import_style=commonjs,mode=grpcwebtext:/test \
--java_out=/test \
--jsonschema_out=/test \
--lint_out=/test \
--nanopb_out=/test \
--php_out=/test \
--python_out=/test \
--ruby_out=/test \
--rust_out=/test \
# --rust_out=/test \
--scala_out=/test \
--ts_out=/test \
--validate_out=lang=go:/test \
Expand Down
13 changes: 8 additions & 5 deletions deps.list
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
ALPINE_IMAGE_VERSION=3.18
ALPINE_IMAGE_VERSION=3.19
DART_IMAGE_VERSION=3.3.3
GO_IMAGE_VERSION=1.21.4-alpine3.18
GO_IMAGE_VERSION=1.22.2-alpine3.19
GOOGLE_API_VERSION=d81d0b9e6993d6ab425dff4d7c3d05fb2e59fa57
GRPC_GATEWAY_VERSION=v2.19.1
GRPC_RUST_VERSION=v0.8.3
GRPC_SWIFT_VERSION=1.21.0
GRPC_WEB_VERSION=1.5.0
NODE_IMAGE_VERSION=18.18.2-alpine3.18
NODE_IMAGE_VERSION=18.20.2-alpine3.19
PROTOC_GEN_DART_VERSION=v21.1.2
PROTOC_GEN_DOC_VERSION=v1.5.1
PROTOC_GEN_GO_GRPC_VERSION=v1.63.2
Expand All @@ -24,8 +24,11 @@ PROTOC_GEN_RUST_VERSION=v3.4.0
PROTOC_GEN_SCALA_VERSION=v0.11.15
PROTOC_GEN_TS_VERSION=0.15.0
PROTOC_GEN_VALIDATE_VERSION=v1.0.4
RUST_IMAGE_VERSION=1.77.2-alpine3.18
SCALA_SBT_IMAGE_VERSION=graalvm-ce-22.3.3-b1-java17_1.9.9_2.12.19
RUST_IMAGE_VERSION=1.77.2-alpine3.19
SCALA_SBT_IMAGE_VERSION=graalvm-ce-22.3.3-b1-java17_1.9.9_3.4.1
SWIFT_IMAGE_VERSION=5.10-focal
UPX_VERSION=4.2.3
XX_IMAGE_VERSION=1.4.0

# https://github.com/protocolbuffers/protobuf-javascript/releases
# grpc-web

0 comments on commit 56d0c13

Please sign in to comment.