From 2f74b5ff830c30a940b8b94728810753bcc7b820 Mon Sep 17 00:00:00 2001
From: "asciidoctor-updateclibot[bot]"
 <asciidoctor-updateclibot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 05:26:17 +0000
Subject: [PATCH 1/4] chore: Update the key ALPINE_VERSION in the README.adoc
 file
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made with ❤️️ by updatecli
---
 README.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.adoc b/README.adoc
index 36e988f..f3e1cce 100644
--- a/README.adoc
+++ b/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

From f2da6215515736882e281bd956466f01bdc860f1 Mon Sep 17 00:00:00 2001
From: "asciidoctor-updateclibot[bot]"
 <asciidoctor-updateclibot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 05:26:18 +0000
Subject: [PATCH 2/4] chore: Update the key ALPINE_VERSION in the test harness
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Made with ❤️️ by updatecli
---
 tests/asciidoctor.bats | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/asciidoctor.bats b/tests/asciidoctor.bats
index f1029c7..c1b3e89 100644
--- a/tests/asciidoctor.bats
+++ b/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

From 932369d597b930319a4fc72ab5bb762d898a3a41 Mon Sep 17 00:00:00 2001
From: "asciidoctor-updateclibot[bot]"
 <asciidoctor-updateclibot[bot]@users.noreply.github.com>
Date: Tue, 4 Jun 2024 05:26:19 +0000
Subject: [PATCH 3/4] chore: Update the value of the base image (ARG
 alpine_version) in the...
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

...  Dockerfile

Made with ❤️️ by updatecli
---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 4635606..7e1dcb0 100644
--- a/Dockerfile
+++ b/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
 
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #

From f9cb0e95a769cc37f8e7d81b14ea246436de594a Mon Sep 17 00:00:00 2001
From: Damien Duportal <damien.duportal@gmail.com>
Date: Tue, 4 Jun 2024 16:04:51 +0200
Subject: [PATCH 4/4] fixup: ensure jpeg dev. headers are present to allow
 py-pillow 9.5 to build on Alpine 3.20

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
---
 Dockerfile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 7e1dcb0..0138457 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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