Skip to content

Commit b7c76bc

Browse files
authored
Merge pull request #12 from n-a-t-e/switch-to-dejavu-font
switch to built-in DejaVu font
2 parents fd77587 + 1799468 commit b7c76bc

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

Dockerfile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@ ENV ERDDAP_WAR_URL https://github.com/BobSimons/erddap/releases/download/v$ERDDA
77
ENV ERDDAP_DATA /erddapData
88

99
RUN \
10-
curl -fSL "http://coastwatch.pfeg.noaa.gov/erddap/download/BitstreamVeraSans.zip" -o /BitstreamVeraSans.zip && \
11-
unzip /BitstreamVeraSans.zip -d ${JAVA_HOME}/lib/fonts/ && \
12-
rm /BitstreamVeraSans.zip && \
1310
curl -fSL "${ERDDAP_CONTENT_URL}" -o /erddapContent.zip && \
1411
unzip /erddapContent.zip -d ${CATALINA_HOME} && \
1512
rm /erddapContent.zip && \

files/setup.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,7 +374,7 @@ At ERD, we use "Bitstream Vera Sans"
374374
http://coastwatch.pfeg.noaa.gov/erddap/download/BitstreamVeraSans.zip
375375
and unzip the files into [javaHome]/jre/lib/fonts so Java sees them.
376376
-->
377-
<fontFamily>Bitstream Vera Sans</fontFamily>
377+
<fontFamily>DejaVu Sans</fontFamily>
378378

379379
<!-- When possible (and it isn't always possible), ERDDAP breaks source data requests
380380
into chunks to conserve memory. See the description of these tags in messages.xml.

0 commit comments

Comments
 (0)