Skip to content

Commit

Permalink
fixup! build: Install fonts from xml2rfc-fonts
Browse files Browse the repository at this point in the history
  • Loading branch information
kesara committed Sep 12, 2024
1 parent 36c970c commit 5120f92
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
9 changes: 0 additions & 9 deletions docker/app.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,6 @@ RUN groupmod --gid $USER_GID $USERNAME \
# Switch to local dev user
USER dev:dev

# Install required fonts
RUN mkdir -p ~/.fonts/opentype /tmp/fonts && \
wget -q -O /tmp/fonts.tar.gz https://github.com/ietf-tools/xml2rfc-fonts/archive/refs/tags/3.22.0.tar.gz && \
tar zxf /tmp/fonts.tar.gz -C /tmp/fonts && \
mv /tmp/fonts/*/noto/* ~/.fonts/opentype/ && \
mv /tmp/fonts/*/roboto_mono/* ~/.fonts/opentype/ && \
rm -rf /tmp/fonts.tar.gz /tmp/fonts/ && \
fc-cache -f

# Install current datatracker python dependencies
COPY requirements.txt /tmp/pip-tmp/
RUN pip3 --disable-pip-version-check --no-cache-dir install --user --no-warn-script-location -r /tmp/pip-tmp/requirements.txt
Expand Down
9 changes: 9 additions & 0 deletions docker/base.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,15 @@ ENV LC_ALL en_US.UTF-8
ADD https://raw.githubusercontent.com/ietf-tools/idnits-mirror/main/idnits /usr/local/bin/
RUN chmod +rx /usr/local/bin/idnits

# Install required fonts
RUN mkdir -p /tmp/fonts && \
wget -q -O /tmp/fonts.tar.gz https://github.com/ietf-tools/xml2rfc-fonts/archive/refs/tags/3.22.0.tar.gz && \
tar zxf /tmp/fonts.tar.gz -C /tmp/fonts && \
mv /tmp/fonts/*/noto/* /usr/local/share/fonts/ && \
mv /tmp/fonts/*/roboto_mono/* /usr/local/share/fonts/ && \
rm -rf /tmp/fonts.tar.gz /tmp/fonts/ && \
fc-cache -f

# Turn off rsyslog kernel logging (doesn't work in Docker)
RUN sed -i '/imklog/s/^/#/' /etc/rsyslog.conf

Expand Down

0 comments on commit 5120f92

Please sign in to comment.