Skip to content

Commit e522a0d

Browse files
committed
remove scala from docker build
1 parent 27fa6f0 commit e522a0d

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

Dockerfile

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ ARG DART_IMAGE_VERSION
55
ARG GO_IMAGE_VERSION
66
ARG NODE_IMAGE_VERSION
77
ARG RUST_IMAGE_VERSION
8-
ARG SCALA_SBT_IMAGE_VERSION
98
ARG SWIFT_IMAGE_VERSION
109
ARG XX_IMAGE_VERSION
1110

@@ -362,18 +361,6 @@ RUN pkg \
362361
/usr/local/lib/node_modules/ts-protoc-gen
363362
RUN install -D protoc-gen-ts /out/usr/bin/protoc-gen-ts
364363

365-
FROM sbtscala/scala-sbt:${SCALA_SBT_IMAGE_VERSION} as protoc_gen_scala
366-
RUN mkdir -p /scala-protobuf
367-
ARG PROTOC_GEN_SCALA_VERSION
368-
RUN curl -k -sSL https://api.github.com/repos/scalapb/ScalaPB/tarball/${PROTOC_GEN_SCALA_VERSION} | tar xz --strip 1 -C /scala-protobuf
369-
WORKDIR /scala-protobuf
370-
RUN gu install native-image
371-
# Make sbt use the version of native-image installed by gu instead of downloading a separate version
372-
ARG NATIVE_IMAGE_INSTALLED=true
373-
RUN ./make_reflect_config.sh
374-
RUN sbt protocGenScalaNativeImage/nativeImage
375-
RUN install -D /scala-protobuf/target/protoc-gen-scala /out/usr/bin/protoc-gen-scala
376-
377364
FROM dart:${DART_IMAGE_VERSION} as protoc_gen_dart
378365
RUN apt-get update
379366
RUN apt-get install -y curl
@@ -411,7 +398,7 @@ COPY --from=protoc_gen_js /out/ /out/
411398
COPY --from=protoc_gen_jsonschema /out/ /out/
412399
COPY --from=protoc_gen_lint /out/ /out/
413400
COPY --from=protoc_gen_rust /out/ /out/
414-
COPY --from=protoc_gen_scala /out/ /out/
401+
#COPY --from=protoc_gen_scala /out/ /out/
415402
COPY --from=protoc_gen_validate /out/ /out/
416403
ARG TARGETARCH
417404
RUN find /out/usr/bin/ -type f \
@@ -476,7 +463,6 @@ RUN mkdir -p /test && \
476463
--python_out=/test \
477464
--ruby_out=/test \
478465
--rust_out=/test \
479-
--scala_out=/test \
480466
--ts_out=/test \
481467
--validate_out=lang=go:/test \
482468
google/protobuf/any.proto

0 commit comments

Comments
 (0)