Skip to content

Commit

Permalink
fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
LaurentGoderre committed May 29, 2024
1 parent dbed8f7 commit 737f089
Show file tree
Hide file tree
Showing 3 changed files with 61 additions and 15 deletions.
23 changes: 19 additions & 4 deletions 17/alpine3.19/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 19 additions & 4 deletions 17/alpine3.20/Dockerfile

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

30 changes: 23 additions & 7 deletions Dockerfile-alpine.template
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ RUN set -eux; \
bison \
coreutils \
{{ if .major >= 17 then ( -}}
docbook-xsl \
docbook-xml \
{{ ) else "" end -}}
dpkg-dev dpkg \
flex \
Expand Down Expand Up @@ -137,14 +137,30 @@ RUN set -eux; \
--with-zstd \
{{ ) else "" end -}}
; \
{{ if .major >= 17 then ( -}}
{{ # install docbook locally (not compatible with the latest alpine package) -}}
curl -sSL https://sourceforge.net/projects/docbook/files/docbook-xsl/1.79.1/docbook-xsl-1.79.1.tar.bz2 -O docbook-xsl.tar.bz2; \
docbookdir="/etc/xml/docbook"; \
catalogdir="/etc/xml/catalog"; \
mkdir -p ${docbookdir}; \
tar \
--extract \
--file docbook-xsl.tar.bz2 \
--directory ${docbookdir} \
--strip-components 1; \
if [ ! -f /etc/xml/catalog ]; then \
xmlcatalog --noout --create /etc/xml/catalog; \
fi; \
for rewrite in rewriteSystem rewriteURI; do \
xmlcatalog --noout --add "$rewrite" "http://docbook.sourceforge.net/release/xsl/current" "file://${docbookdir}" "${catalogdir}"; \
done; \
{{ ) else "" end -}}
make -j "$(nproc)" world; \
{{ if .major <= 16 then ( -}}
{{ if .major >= 17 then ( -}}
rm -rf ${docbookdir}; \
xmlcatalog --noout --del "file://${docbookdir}" "${catalogdir}"; \
{{ ) else "" end -}}
make install-world; \
{{ ) else ( -}}
# TODO: Figure out why man pages aren't generated
# https://github.com/docker-library/postgres/actions/runs/9271070104/job/25505640101?pr=1244
make install; \
{{ ) end -}}
make -C contrib install; \
\
runDeps="$( \
Expand Down

0 comments on commit 737f089

Please sign in to comment.