Make rsvg-convert available in these container images.
Also go forward to Fedora 39 as the regression of font info corruption
observed in Fedora 38 has been resolved.
Keep inkscape as well so that the resulting container images can work
on top of Git repos before January 2024.
Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx>
---
docker/Dockerfile | 4 ++--
docker/Dockerfile.fedora | 7 ++-----
2 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/docker/Dockerfile b/docker/Dockerfile
index ec89c6f2..66fd2b3f 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,7 +1,7 @@
ARG rel=latest
FROM ubuntu:$rel
-RUN apt-get update && apt-get install -y locales && \
+RUN apt-get update && apt-get upgrade -y && apt-get install -y locales && \
localedef -i en_US -c -f UTF-8 -A /usr/share/locale/locale.alias en_US.UTF-8 && \
rm -rf /var/lib/apt/lists/*
ENV LANG en_US.utf8
@@ -9,7 +9,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=UTC apt-get install -y t
rm -rf /var/lib/apt/lists/*
RUN apt-get update && apt-get install -y fig2ps inkscape xfig graphviz psutils \
texlive-publishers texlive-pstricks texlive-science texlive-fonts-extra \
- make nano vim git curl gnuplot-nox time poppler-utils && \
+ make nano vim git curl gnuplot-nox time poppler-utils librsvg2-bin && \
rm -rf /var/lib/apt/lists/*
COPY steel-city-comic.regular.ttf /usr/local/share/fonts/
RUN fc-cache /usr/local/share/fonts/
diff --git a/docker/Dockerfile.fedora b/docker/Dockerfile.fedora
index 5eff2a2a..6812163a 100644
--- a/docker/Dockerfile.fedora
+++ b/docker/Dockerfile.fedora
@@ -1,15 +1,12 @@
-# As of June 2023, Inkscape of Fedora 38 has a regression of font markup
-# corruption.
-# Stay with Fedora 37 for the moment.
# You can override "rel" by saying:
# docker build -t <tag> --build-arg rel=latest -f Dockerfile.fedora .
#
-ARG rel=37
+ARG rel=latest
FROM fedora:$rel
RUN dnf -y update && dnf install -y --setopt=tsflags=nodocs \
fig2ps graphviz inkscape make git vim nano gnuplot-minimal groff time \
- liberation-fonts dejavu-fonts-all poppler-utils \
+ liberation-fonts dejavu-fonts-all poppler-utils librsvg2-tools \
texlive-collection-plaingeneric texlive-collection-binextra \
texlive-collection-latexextra texlive-epstopdf texlive-fontools \
texlive-newtx texlive-newtxtt texlive-nimbus15 texlive-courier-scaled \
--
2.34.1
