Skip to content

Commit 2375a54

Browse files
fixup
1 parent dbed8f7 commit 2375a54

File tree

3 files changed

+61
-15
lines changed

3 files changed

+61
-15
lines changed

Diff for: 17/alpine3.19/Dockerfile

+19-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: 17/alpine3.20/Dockerfile

+19-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Dockerfile-alpine.template

+23-7
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ RUN set -eux; \
4343
bison \
4444
coreutils \
4545
{{ if .major >= 17 then ( -}}
46-
docbook-xsl \
46+
docbook-xml \
4747
{{ ) else "" end -}}
4848
dpkg-dev dpkg \
4949
flex \
@@ -137,14 +137,30 @@ RUN set -eux; \
137137
--with-zstd \
138138
{{ ) else "" end -}}
139139
; \
140+
{{ if .major >= 17 then ( -}}
141+
{{ # install docbook locally (not compatible with the latest alpine package) -}}
142+
wget -O docbook-xsl.tar.bz2 https://sourceforge.net/projects/docbook/files/docbook-xsl/1.79.1/docbook-xsl-1.79.1.tar.bz2; \
143+
docbookdir="/etc/xml/docbook"; \
144+
catalogdir="/etc/xml/catalog"; \
145+
mkdir -p ${docbookdir}; \
146+
tar \
147+
--extract \
148+
--file docbook-xsl.tar.bz2 \
149+
--directory ${docbookdir} \
150+
--strip-components 1; \
151+
if [ ! -f /etc/xml/catalog ]; then \
152+
xmlcatalog --noout --create /etc/xml/catalog; \
153+
fi; \
154+
for rewrite in rewriteSystem rewriteURI; do \
155+
xmlcatalog --noout --add "$rewrite" "http://docbook.sourceforge.net/release/xsl/current" "file://${docbookdir}" "${catalogdir}"; \
156+
done; \
157+
{{ ) else "" end -}}
140158
make -j "$(nproc)" world; \
141-
{{ if .major <= 16 then ( -}}
159+
{{ if .major >= 17 then ( -}}
160+
rm -rf ${docbookdir}; \
161+
xmlcatalog --noout --del "file://${docbookdir}" "${catalogdir}"; \
162+
{{ ) else "" end -}}
142163
make install-world; \
143-
{{ ) else ( -}}
144-
# TODO: Figure out why man pages aren't generated
145-
# https://github.com/docker-library/postgres/actions/runs/9271070104/job/25505640101?pr=1244
146-
make install; \
147-
{{ ) end -}}
148164
make -C contrib install; \
149165
\
150166
runDeps="$( \

0 commit comments

Comments
 (0)