Browse Source
Merge pull request #14687 from thingsboard/docker-openjdk25-default
Set default base Docker image to thingsboard/openjdk25:trixie-slim
pull/14718/head
Viacheslav Klimov
9 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
16 additions and
1 deletions
-
msa/pom.xml
-
msa/tb-node/docker/Dockerfile
|
|
|
@ -32,7 +32,7 @@ |
|
|
|
<properties> |
|
|
|
<main.dir>${basedir}/..</main.dir> |
|
|
|
<docker.repo>thingsboard</docker.repo> |
|
|
|
<docker.base.image>thingsboard/openjdk17:bookworm-slim</docker.base.image> |
|
|
|
<docker.base.image>thingsboard/openjdk25:trixie-slim</docker.base.image> |
|
|
|
<dockerfile.skip>true</dockerfile.skip> |
|
|
|
<blackBoxTests.skip>true</blackBoxTests.skip> |
|
|
|
<dockerfile-maven.version>1.4.13</dockerfile-maven.version> |
|
|
|
|
|
|
|
@ -16,6 +16,21 @@ |
|
|
|
|
|
|
|
FROM ${docker.base.image} |
|
|
|
|
|
|
|
# For SVG renderer Debian Trixie slim fonts should be installed explicitly |
|
|
|
RUN echo "Previously installed font libraries:" \ |
|
|
|
&& (dpkg -l | grep -E 'font|dejavu|harfbuzz' || echo " (none)") \ |
|
|
|
&& apt-get update \ |
|
|
|
&& apt-get install -y --no-install-recommends \ |
|
|
|
libharfbuzz0b fontconfig fonts-dejavu-core \ |
|
|
|
&& rm -rf /var/lib/apt/lists/* \ |
|
|
|
&& echo "Current fonts libraries:" \ |
|
|
|
&& (dpkg -l | grep -E 'font|dejavu|harfbuzz') \ |
|
|
|
&& echo "Font config list:" \ |
|
|
|
&& fc-list && test -n "$(fc-list)" \ |
|
|
|
&& (fc-list | grep -i dejavu) \ |
|
|
|
&& echo "Harfbuzz library test with ldconfig:" \ |
|
|
|
&& (ldconfig -p | grep harfbuzz) |
|
|
|
|
|
|
|
COPY logback.xml start-tb-node.sh ${pkg.name}.deb /tmp/ |
|
|
|
|
|
|
|
RUN chmod a+x /tmp/*.sh \ |
|
|
|
|
