Browse Source

Set default base image to thingsboard/openjdk25:trixie-slim

pull/14687/head
Viacheslav Klimov 9 months ago
parent
commit
b72f6a8fd1
  1. 2
      msa/pom.xml
  2. 15
      msa/tb-node/docker/Dockerfile
  3. 17
      msa/tb/docker-cassandra/Dockerfile
  4. 17
      msa/tb/docker-postgres/Dockerfile

2
msa/pom.xml

@ -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/openjdk17:bookworm-slim</docker.base.image> <docker.base.image>thingsboard/openjdk25:trixie-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>

15
msa/tb-node/docker/Dockerfile

@ -16,6 +16,21 @@
FROM ${docker.base.image} 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/ COPY logback.xml start-tb-node.sh ${pkg.name}.deb /tmp/
RUN chmod a+x /tmp/*.sh \ RUN chmod a+x /tmp/*.sh \

17
msa/tb/docker-cassandra/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk17:bookworm-slim FROM ${docker.base.image}
ENV PG_MAJOR=16 ENV PG_MAJOR=16
@ -40,6 +40,21 @@ ENV PATH=$PATH:/usr/lib/postgresql/$PG_MAJOR/bin
ENV PGLOG=/var/log/postgres ENV PGLOG=/var/log/postgres
ENV CASSANDRA_LOG=/var/log/cassandra ENV CASSANDRA_LOG=/var/log/cassandra
# 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 ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
RUN apt-get update \ RUN apt-get update \

17
msa/tb/docker-postgres/Dockerfile

@ -14,7 +14,7 @@
# limitations under the License. # limitations under the License.
# #
FROM thingsboard/openjdk17:bookworm-slim FROM ${docker.base.image}
ENV PG_MAJOR 12 ENV PG_MAJOR 12
@ -32,6 +32,21 @@ ENV SPRING_DATASOURCE_USERNAME=${pkg.user}
ENV PGLOG=/var/log/postgres ENV PGLOG=/var/log/postgres
# 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 ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/ COPY logback.xml ${pkg.name}.conf start-db.sh stop-db.sh start-tb.sh upgrade-tb.sh install-tb.sh ${pkg.name}.deb /tmp/
RUN apt-get update \ RUN apt-get update \

Loading…
Cancel
Save