Skip to content

Commit

Permalink
Merge pull request #41 from SokaDance/versions
Browse files Browse the repository at this point in the history
[gen][build] update generators versions
  • Loading branch information
SokaDance authored Apr 29, 2021
2 parents 05ba581 + b6eb2b5 commit 181632d
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions Dockerfile-cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ FROM masagroup/soft.generator.base AS base
FROM openjdk:16-alpine AS jvm
COPY --from=base /soft.generator.cpp /soft.generator.cpp
WORKDIR /soft.generator.cpp
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.cpp-1.2.2.jar > java.modules \
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.cpp-1.2.3.jar > java.modules \
&& jlink --strip-java-debug-attributes --add-modules jdk.zipfs,$(cat java.modules) --output /java-generator

# Build result stage
FROM alpine
COPY --from=jvm /soft.generator.cpp/*.jar /usr/share/soft.generator.cpp/
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator

ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.cpp/soft.generator.cpp-1.2.2.jar"]
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.cpp/soft.generator.cpp-1.2.3.jar"]
4 changes: 2 additions & 2 deletions Dockerfile-ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ FROM masagroup/soft.generator.base AS base
FROM openjdk:16-alpine AS jvm
COPY --from=base /soft.generator.ts /soft.generator.ts
WORKDIR /soft.generator.ts
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.0.2.jar > java.modules \
RUN jdeps --print-module-deps --multi-release 16 --ignore-missing-deps --class-path '*' -recursive soft.generator.ts-1.0.3.jar > java.modules \
&& jlink --strip-java-debug-attributes --add-modules $(cat java.modules) --output /java-generator

# Build result stage
FROM alpine
COPY --from=jvm /soft.generator.ts/*.jar /usr/share/soft.generator.ts/
COPY --from=jvm /java-generator /usr/lib/jvm/java-generator

ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.0.2.jar"]
ENTRYPOINT ["/usr/lib/jvm/java-generator/bin/java","-jar","/usr/share/soft.generator.ts/soft.generator.ts-1.0.3.jar"]
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ langs := go ts cpp
packages := go ts cpp common
soft.generators.version := 1.5.0
soft.generator.common.version := 1.3.0
soft.generator.cpp.version := 1.2.2
soft.generator.cpp.version := 1.2.3
soft.generator.go.version := 1.5.0
soft.generator.ts.version := 1.0.2
soft.generator.ts.version := 1.0.3

export DOCKER_BUILDKIT=1

Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.cpp/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-Name: Soft Generator Cpp
Bundle-SymbolicName: soft.generator.cpp
Bundle-Version: 1.2.2
Bundle-Version: 1.2.3
Export-Package: soft.generator.cpp,soft.generator.cpp.lib,soft.generat
or.cpp.lib.cls,soft.generator.cpp.lib.factory,soft.generator.cpp.lib.
pack,soft.generator.cpp.tests
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.cpp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.5.0</version>
</parent>
<artifactId>soft.generator.cpp</artifactId>
<version>1.2.2</version>
<version>1.2.3</version>
<dependencies>
<dependency>
<groupId>soft.generators</groupId>
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.ts/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Created-By: 13.0.2+8 (Oracle Corporation)
Bundle-ManifestVersion: 2
Bundle-Name: Soft Generator TypeScript
Bundle-SymbolicName: soft.generator.ts
Bundle-Version: 1.0.2
Bundle-Version: 1.0.3
Export-Package: soft.generator.ts
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Automatic-Module-Name: soft.generator.ts
Expand Down
2 changes: 1 addition & 1 deletion soft.generators/soft.generator.ts/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<version>1.5.0</version>
</parent>
<artifactId>soft.generator.ts</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<dependencies>
<dependency>
<groupId>soft.generators</groupId>
Expand Down

0 comments on commit 181632d

Please sign in to comment.