From b2bb27f369c56707c85a57c08fe1f9e0e8dd9053 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 12 Oct 2022 21:05:29 +0200 Subject: [PATCH 1/2] Revert "Revert "Add license for bibliographic data"" This reverts commit 59b2a5ca15c9cafab92491577079dd3ba954f6c0. --- Makefile | 5 ++++- refs-LICENSE | 9 +++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 refs-LICENSE diff --git a/Makefile b/Makefile index 26efb1ba7..34a74a8e4 100644 --- a/Makefile +++ b/Makefile @@ -76,8 +76,11 @@ inbox-xml: $(OUTDIR)/inbox $(proto_xep_xmls) .PHONY: pdf pdf: $(xep_pdfs) +$(REFSDIR)/LICENSE: refs-LICENSE + cp $< $@ + .PHONY: refs -refs: $(xep_refs) +refs: $(xep_refs) $(REFSDIR)/LICENSE .PHONY: examples examples: $(xep_examples) diff --git a/refs-LICENSE b/refs-LICENSE new file mode 100644 index 000000000..64791b8c3 --- /dev/null +++ b/refs-LICENSE @@ -0,0 +1,9 @@ +To the extent possible under law, the XMPP Standards Foundation (XSF) +has waived all copyright and related or neighboring rights to XSF's +bibliographic data. + +That is, the bibliographic data, which is also accessible via +https://xmpp.org/extensions/refs/, is put in the public domain via +CC0 1.0 [1]. + +1: https://creativecommons.org/publicdomain/zero/1.0/ From 5bc830b697fed5bc6b8ff5d323ea5e00dc7b6798 Mon Sep 17 00:00:00 2001 From: Florian Schmaus Date: Wed, 12 Oct 2022 22:03:20 +0200 Subject: [PATCH 2/2] Dockerfile: bind mount the build context Instead of copying individual files into /src, we simply bind mount the build context, which is typically the XEPs repo, and invoke 'make' with the givne targets on that. --- Dockerfile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 86703430a..66d50380e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,14 +6,7 @@ FROM xmppxsf/xeps-base:latest as build ARG NCORES=1 ARG TARGETS="html inbox-html inbox-xml pdf xeplist refs xml" -COPY *.xml xep.* *.css *.xsl *.js *.xsl Makefile /src/ -COPY resources/*.pdf /src/resources/ -COPY tools/*.py /src/tools/ -COPY inbox/*.xml inbox/*.ent inbox/*.dtd /src/inbox/ -COPY texml-xsl/*.xsl /src/texml-xsl/ - -WORKDIR /src -RUN OUTDIR=/var/www/html/extensions/ make -j$NCORES $TARGETS +RUN --mount=target=/xeps make -C /xeps -j$NCORES $TARGETS OUTDIR=/var/www/html/extensions RUN bash -c 'rm -f /var/www/html/extensions/*.{log,aux,toc,tex,tex.xml,out}' FROM nginx:1-alpine