|
18 | 18 | # 3.9.9-eclipse-temurin-11-alpine |
19 | 19 | FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/maven@sha256:d3f04985c6a68415e36c0a6468d0f8316f27d4dbee77bc459257ba444224bd9f AS ggj-build |
20 | 20 |
|
21 | | -WORKDIR /sdk-platform-java |
22 | | -COPY sdk-platform-java/ . |
| 21 | +WORKDIR /google-cloud-java |
| 22 | + |
| 23 | +COPY . . |
23 | 24 | # {x-version-update-start:gapic-generator-java:current} |
24 | 25 | ENV DOCKER_GAPIC_GENERATOR_VERSION="2.72.0-SNAPSHOT" |
25 | 26 | # {x-version-update-end} |
26 | 27 |
|
27 | 28 | # Download the java formatter |
28 | | -RUN mvn -pl gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version |
| 29 | +RUN mvn -pl sdk-platform-java/gapic-generator-java-pom-parent help:evaluate -Dexpression='google-java-format.version' -q -DforceStdout > /java-formatter-version |
29 | 30 | RUN cat /java-formatter-version |
30 | 31 | RUN V=$(cat /java-formatter-version) && curl -o "/google-java-format.jar" "https://maven-central.storage-download.googleapis.com/maven2/com/google/googlejavaformat/google-java-format/${V}/google-java-format-${V}-all-deps.jar" |
31 | 32 |
|
32 | 33 | # Skipping the fmt check until 3.9.9-eclipse-temurin-17-alpine:969014ee8852 is available in Airlock. |
33 | | -RUN mvn install -B -ntp -DskipTests -Dclirr.skip -Dcheckstyle.skip -Dfmt.skip |
| 34 | +RUN mvn install -B -ntp -T 1.5C -DskipTests -Dcheckstyle.skip -Dclirr.skip -Denforcer.skip -Dfmt.skip -pl sdk-platform-java/gapic-generator-java --also-make |
34 | 35 | RUN cp "/root/.m2/repository/com/google/api/gapic-generator-java/${DOCKER_GAPIC_GENERATOR_VERSION}/gapic-generator-java-${DOCKER_GAPIC_GENERATOR_VERSION}.jar" \ |
35 | | - "./gapic-generator-java.jar" |
| 36 | + "/gapic-generator-java.jar" |
36 | 37 |
|
37 | 38 | # 3.12.3-slim-bookworm |
38 | 39 | FROM us-docker.pkg.dev/artifact-foundry-prod/docker-3p-trusted/python@sha256:afc139a0a640942491ec481ad8dda10f2c5b753f5c969393b12480155fe15a63 as final |
@@ -94,7 +95,7 @@ ENV JAVA_FORMATTER_LOCATION="${HOME}/.library_generation/google-java-format.jar" |
94 | 95 | # Note that the destination is a well-known location that will be assumed at runtime |
95 | 96 | # We hard-code the location string to avoid making it configurable (via ARG) as |
96 | 97 | # well as to avoid it making it overridable at runtime (via ENV). |
97 | | -COPY --from=ggj-build "/sdk-platform-java/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar" |
| 98 | +COPY --from=ggj-build "/gapic-generator-java.jar" "${HOME}/.library_generation/gapic-generator-java.jar" |
98 | 99 | RUN chmod 755 "${HOME}/.library_generation/gapic-generator-java.jar" |
99 | 100 | ENV GAPIC_GENERATOR_LOCATION="${HOME}/.library_generation/gapic-generator-java.jar" |
100 | 101 |
|
|
0 commit comments