Skip to content

Commit 9c13b33

Browse files
buuhsmeadhdaems
andauthored
Update to latest asciidoctor 2.0.16 (#529)
* upstream (asciidoctor) also removed kindlegen * new version, from 1.1 into 1.2 * Update to latest versions and made nwdiag pdf aware * Dockerfile L 46 and 47 spaces. * Dockerfile L 46 spaces. * Update versions of asciidoctor dependencies * Removed non used TODO items * Update to latest asciidoctor * Update to latest asciidoctor * Formatting and python3-devel * asciidoctor 2.0.16 * Update version.json Co-authored-by: Huub Daems <[email protected]>
1 parent 55f2a61 commit 9c13b33

File tree

2 files changed

+22
-23
lines changed

2 files changed

+22
-23
lines changed

utilities/ubi8-asciidoctor/Dockerfile

+21-22
Original file line numberDiff line numberDiff line change
@@ -2,43 +2,41 @@ FROM registry.access.redhat.com/ubi8:latest
22

33
LABEL MAINTAINERS="Red Hat Services"
44

5-
ARG asciidoctor_version=2.0.15
5+
ARG asciidoctor_version=2.0.16
66
ARG asciidoctor_confluence_version=0.0.2
7-
ARG asciidoctor_pdf_version=1.6.0
8-
ARG asciidoctor_diagram_version=2.1.2
7+
ARG asciidoctor_pdf_version=1.6.1
8+
ARG asciidoctor_diagram_version=2.2.1
99
ARG asciidoctor_epub3_version=1.5.1
1010
ARG asciidoctor_mathematical_version=0.3.5
1111
ARG asciidoctor_revealjs_version=4.1.0
12-
ARG kramdown_asciidoc_version=1.0.1
12+
ARG kramdown_asciidoc_version=2.0.0
1313
ARG asciidoctor_bibtex_version=0.8.0
14-
ARG pandoc_version=2.13
14+
ARG pandoc_version=2.14.2
1515

1616

1717
ENV ASCIIDOCTOR_VERSION=${asciidoctor_version} \
18-
ASCIIDOCTOR_CONFLUENCE_VERSION=${asciidoctor_confluence_version} \
19-
ASCIIDOCTOR_PDF_VERSION=${asciidoctor_pdf_version} \
20-
ASCIIDOCTOR_DIAGRAM_VERSION=${asciidoctor_diagram_version} \
21-
ASCIIDOCTOR_EPUB3_VERSION=${asciidoctor_epub3_version} \
22-
ASCIIDOCTOR_MATHEMATICAL_VERSION=${asciidoctor_mathematical_version} \
23-
ASCIIDOCTOR_REVEALJS_VERSION=${asciidoctor_revealjs_version} \
24-
KRAMDOWN_ASCIIDOC_VERSION=${kramdown_asciidoc_version} \
25-
ASCIIDOCTOR_BIBTEX_VERSION=${asciidoctor_bibtex_version} \
26-
PANDOC_VERSION=${pandoc_version}
27-
18+
ASCIIDOCTOR_CONFLUENCE_VERSION=${asciidoctor_confluence_version} \
19+
ASCIIDOCTOR_PDF_VERSION=${asciidoctor_pdf_version} \
20+
ASCIIDOCTOR_DIAGRAM_VERSION=${asciidoctor_diagram_version} \
21+
ASCIIDOCTOR_EPUB3_VERSION=${asciidoctor_epub3_version} \
22+
ASCIIDOCTOR_MATHEMATICAL_VERSION=${asciidoctor_mathematical_version} \
23+
ASCIIDOCTOR_REVEALJS_VERSION=${asciidoctor_revealjs_version} \
24+
KRAMDOWN_ASCIIDOC_VERSION=${kramdown_asciidoc_version} \
25+
ASCIIDOCTOR_BIBTEX_VERSION=${asciidoctor_bibtex_version} \
26+
PANDOC_VERSION=${pandoc_version}
2827

2928
USER root
3029

31-
3230
# Installing Ruby Gems needed in the image
3331
# including asciidoctor itself
3432

3533
RUN dnf install -y \
3634
python3-devel \
3735
git \
3836
ruby \
39-
make \
37+
make \
4038
gcc \
41-
redhat-rpm-config \
39+
redhat-rpm-config \
4240
ruby-devel \
4341
&& gem install --no-document \
4442
"asciidoctor:${ASCIIDOCTOR_VERSION}" \
@@ -56,9 +54,10 @@ RUN dnf install -y \
5654
slim \
5755
thread_safe \
5856
tilt \
59-
"asciidoctor-bibtex:${ASCIIDOCTOR_BIBTEX_VERSION}" \
60-
&& rm -rf /usr/local/share/gems/cache \
61-
&& dnf clean all && rm -rf /var/lib/dnf
57+
"asciidoctor-bibtex:${ASCIIDOCTOR_BIBTEX_VERSION}" \
58+
&& rm -rf /usr/local/share/gems/cache \
59+
&& dnf clean all \
60+
&& rm -rf /var/lib/dnf
6261

6362
# install pandoc
6463
RUN curl -L https://github.com/jgm/pandoc/releases/download/${PANDOC_VERSION}/pandoc-${PANDOC_VERSION}-linux-amd64.tar.gz | tar xvz --strip-components 1 -C /usr/local/
@@ -69,6 +68,7 @@ VOLUME /documents
6968
RUN mkdir /home/work \
7069
&& chgrp -R 0 /home/work \
7170
&& chmod -R g=u /home/work
71+
7272
ENV HOME=/home/work
7373

7474
# Installing Python dependencies for additional
@@ -82,4 +82,3 @@ RUN pip3 install --no-cache-dir \
8282
USER 1001
8383

8484
CMD ["/bin/bash"]
85-
+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"version":"v1.7"}
1+
{"version":"v1.8"}

0 commit comments

Comments
 (0)