Browse Source
Add font installation to docker-postgres and docker-cassandra Dockerfiles
Use ${docker.base.image} instead of hardcoded base image and add the SVG renderer font installation script matching tb-node Dockerfile.
pull/15309/head
Viacheslav Klimov
2 months ago
Failed to extract signature
2 changed files with
32 additions and
2 deletions
-
msa/tb/docker-cassandra/Dockerfile
-
msa/tb/docker-postgres/Dockerfile
|
|
|
@ -14,7 +14,7 @@ |
|
|
|
# limitations under the License. |
|
|
|
# |
|
|
|
|
|
|
|
FROM thingsboard/openjdk25:trixie-slim |
|
|
|
FROM ${docker.base.image} |
|
|
|
|
|
|
|
ENV PG_MAJOR=16 |
|
|
|
|
|
|
|
@ -40,6 +40,21 @@ ENV PATH=$PATH:/usr/lib/postgresql/$PG_MAJOR/bin |
|
|
|
ENV PGLOG=/var/log/postgres |
|
|
|
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/ |
|
|
|
|
|
|
|
RUN apt-get update \ |
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ |
|
|
|
# limitations under the License. |
|
|
|
# |
|
|
|
|
|
|
|
FROM thingsboard/openjdk25:trixie-slim |
|
|
|
FROM ${docker.base.image} |
|
|
|
|
|
|
|
ENV PG_MAJOR 12 |
|
|
|
|
|
|
|
@ -32,6 +32,21 @@ ENV SPRING_DATASOURCE_USERNAME=${pkg.user} |
|
|
|
|
|
|
|
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/ |
|
|
|
|
|
|
|
RUN apt-get update \ |
|
|
|
|
