Merge pull request #449 from asciidoctor/updatecli_main_8c42486d82571…

…77e5489228498307fe0b25d024064f25ebe7974b0ae69da9546

Bump Alpine Linux Version to 3.20.0

Dockerfile

@@ -1,7 +1,7 @@
 # Golang version defined in https://github.com/kaishuu0123/erd-go/blob/${ERD_VERSION}/go.mod#L3
 ARG ERD_GOLANG_BUILDER_TAG=1.15-alpine
 ARG A2S_GOLANG_BUILDER_TAG=1.20-alpine3.18
-ARG alpine_version=3.19.1
+ARG alpine_version=3.20.0
 FROM alpine:${alpine_version} AS base
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -52,6 +52,7 @@ RUN GOBIN=/app go install github.com/asciitosvg/asciitosvg/cmd/a2s@"${A2S_VERSIO
 # Final image
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 FROM main-minimal AS main
+SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
 LABEL maintainers="Guillaume Scheibel <guillaume.scheibel@gmail.com>, Damien DUPORTAL <damien.duportal@gmail.com>"
 
 ARG TARGETARCH
@@ -133,7 +134,9 @@ RUN apk add --no-cache --virtual .rubymakedepends \
   "asciidoctor-bibtex:${ASCIIDOCTOR_BIBTEX_VERSION}" \
   "asciidoctor-kroki:${ASCIIDOCTOR_KROKI_VERSION}" \
   "asciidoctor-reducer:${ASCIIDOCTOR_REDUCER_VERSION}" \
-  && apk del -r --no-cache .rubymakedepends
+  && apk del -r --no-cache .rubymakedepends \
+  # Fixes an issue with 2 nokogiri versions breaking asciidoctor-epub3 on arm64
+  && if [[ ${TARGETARCH} == arm64 ]]; then gem uninstall nokogiri -v '1.16.0'; fi
 
 # Specific pipx environement variables to ensure binaries (and docs, etc.) are available for all users
 # See https://github.com/pypa/pipx/blob/main/docs/installation.md#installation-options
@@ -150,6 +153,7 @@ RUN apk add --no-cache \
     build-base \
     freetype-dev \
     python3-dev \
+    jpeg-dev \
   && for pipx_app in \
     actdiag \
     'blockdiag[pdf]' \
@@ -165,9 +169,6 @@ COPY --from=erd-builder /app/erd-go /usr/local/bin/
 # for backward compatibility
 RUN ln -snf /usr/local/bin/erd-go /usr/local/bin/erd
 
-# Fixes an issue with 2 nokogiri versions breaking asciidoctor-epub3 on arm64
-RUN if [[ ${TARGETARCH} == arm64 ]]; then gem uninstall nokogiri -v '1.16.0'; fi
-
 WORKDIR /documents
 VOLUME /documents
 

README.adoc

@@ -1,4 +1,4 @@
-:ALPINE_VERSION: 3.19.1
+:ALPINE_VERSION: 3.20.0
 :ASCIIDOCTOR_VERSION: 2.0.23
 :ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2
 :ASCIIDOCTOR_PDF_VERSION: 2.3.17

tests/asciidoctor.bats

@@ -1,7 +1,7 @@
 #!/usr/bin/env bats
 
 TMP_GENERATION_DIR="${BATS_TEST_DIRNAME}/tmp"
-ALPINE_VERSION=3.19.1
+ALPINE_VERSION=3.20.0
 ASCIIDOCTOR_VERSION=2.0.23
 ASCIIDOCTOR_CONFLUENCE_VERSION=0.0.2
 ASCIIDOCTOR_PDF_VERSION=2.3.17