Skip to content

Commit

Permalink
Update package versions & increment major version (#583)
Browse files Browse the repository at this point in the history
The biggest update is moving to the 2.x version of ascidoctor-pdf. This
may cause breakages as defining the theme has many updates.

A few minor typo's are also fixed in the README.
  • Loading branch information
branic authored Jul 26, 2022
1 parent 584fe14 commit f8fbade
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 13 deletions.
20 changes: 11 additions & 9 deletions utilities/ubi8-asciidoctor/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@ FROM registry.access.redhat.com/ubi8:latest

LABEL MAINTAINERS="Red Hat Services"

ARG RUBY_VERSION=2.7
ARG asciidoctor_version=2.0.16
ARG RUBY_VERSION=3.0
ARG asciidoctor_version=2.0.17
ARG asciidoctor_confluence_version=0.0.2
ARG asciidoctor_pdf_version=1.6.1
ARG asciidoctor_diagram_version=2.2.1
ARG asciidoctor_pdf_version=2.2.0
ARG asciidoctor_diagram_version=2.2.3
ARG asciidoctor_epub3_version=1.5.1
ARG asciidoctor_mathematical_version=0.3.5
ARG asciidoctor_revealjs_version=4.1.0
ARG kramdown_asciidoc_version=2.0.0
ARG asciidoctor_bibtex_version=0.8.0
ARG pandoc_version=2.16.2
ARG asciidoctor_reducer_version=1.0.0.alpha.8
ARG pandoc_version=2.18
ARG asciidoctor_reducer_version=1.0.2
ARG epubcheck_ruby_version=4.2.6.0


ENV ASCIIDOCTOR_VERSION=${asciidoctor_version} \
Expand All @@ -26,7 +27,8 @@ ENV ASCIIDOCTOR_VERSION=${asciidoctor_version} \
KRAMDOWN_ASCIIDOC_VERSION=${kramdown_asciidoc_version} \
ASCIIDOCTOR_BIBTEX_VERSION=${asciidoctor_bibtex_version} \
PANDOC_VERSION=${pandoc_version} \
ASCIIDOCTOR_REDUCER_VERSION=${asciidoctor_reducer_version}
ASCIIDOCTOR_REDUCER_VERSION=${asciidoctor_reducer_version} \
EPUBCHECK_RUBY_VERSION=${epubcheck_ruby_version}

USER root

Expand All @@ -53,7 +55,7 @@ RUN dnf install -y \
"asciidoctor-pdf:${ASCIIDOCTOR_PDF_VERSION}" \
"asciidoctor-revealjs:${ASCIIDOCTOR_REVEALJS_VERSION}" \
coderay \
epubcheck-ruby:4.2.4.0 \
epubcheck-ruby:${EPUBCHECK_RUBY_VERSION} \
haml \
"kramdown-asciidoc:${KRAMDOWN_ASCIIDOC_VERSION}" \
rouge \
Expand All @@ -67,7 +69,7 @@ RUN dnf install -y \
&& rm -rf /var/lib/dnf

# install pandoc
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/
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/ pandoc-${PANDOC_VERSION}/bin/pandoc

WORKDIR /documents
VOLUME /documents
Expand Down
7 changes: 4 additions & 3 deletions utilities/ubi8-asciidoctor/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
# ubi8-asciidoctor

A utility image for the UBI8 image + asciidoctor.
A utility image for the UBI8 image + asciidoctor.

Contains the primary used asciidoctor-pdf for generating reports.

It's base is from https://github.com/asciidoctor/docker-asciidoctor but now ubi based.
It's base is from <https://github.com/asciidoctor/docker-asciidoctor> but now ubi based.

## Purpose

Useful for environments where these libraries/tools are needed such as:

* local development
* CI tools that do not require specific CI tooling configuraiton, such as GiLab Jobs.
* CI tools that do not require specific CI tooling configuration, such as GiLab Jobs.

## Published

Expand Down
2 changes: 1 addition & 1 deletion utilities/ubi8-asciidoctor/version.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"version":"v1.13.0"}
{"version":"v2.0.0"}

0 comments on commit f8fbade

Please sign in to comment.