tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge branch 'lts-4.2' into release-4.2

release-4.2
Andrii Shvaika 9 months ago
parent
c0b95b7898 1ff694f0fd
commit
a59b2a38d9
1 changed files with 24 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      msa/pom.xml

27
msa/pom.xml
View File

@ -32,7 +32,7 @@
<properties> <properties>
<main.dir>${basedir}/..</main.dir> <main.dir>${basedir}/..</main.dir>
<docker.repo>thingsboard</docker.repo> <docker.repo>thingsboard</docker.repo>
<docker.base.image>thingsboard/openjdk25:trixie-slim</docker.base.image> <docker.base.image>thingsboard/openjdk17:bookworm-slim</docker.base.image>
<dockerfile.skip>true</dockerfile.skip> <dockerfile.skip>true</dockerfile.skip>
<blackBoxTests.skip>true</blackBoxTests.skip> <blackBoxTests.skip>true</blackBoxTests.skip>
<dockerfile-maven.version>1.4.13</dockerfile-maven.version> <dockerfile-maven.version>1.4.13</dockerfile-maven.version>
@ -126,10 +126,10 @@
</build> </build>
</profile> </profile>
<profile> <profile>
<id>lts</id> <id>push-lts-docker-amd-arm-images</id>
<activation> <activation>
<property> <property>
<name>lts</name> <name>push-lts-docker-amd-arm-images</name>
</property> </property>
</activation> </activation>
<properties> <properties>
@ -141,6 +141,27 @@
<groupId>org.codehaus.mojo</groupId> <groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId> <artifactId>exec-maven-plugin</artifactId>
<executions> <executions>
<execution>
<id>push-version-docker-amd-arm-images</id>
<phase>${docker.push-arm-amd-image.phase}</phase>
<goals>
<goal>exec</goal>
</goals>
<configuration>
<executable>docker</executable>
<workingDirectory>${project.build.directory}</workingDirectory>
<arguments>
<argument>buildx</argument>
<argument>build</argument>
<argument>-t</argument>
<argument>${docker.repo}/${docker.name}:${project.version}</argument>
<argument>--platform=linux/amd64,linux/arm64</argument>
<argument>-o</argument>
<argument>type=registry</argument>
<argument>.</argument>
</arguments>
</configuration>
</execution>
<execution> <execution>
<id>push-lts-docker-amd-arm-images</id> <id>push-lts-docker-amd-arm-images</id>
<phase>${docker.push-arm-amd-image.phase}</phase> <phase>${docker.push-arm-amd-image.phase}</phase>

Write Preview
Loading…
Cancel
Save