From d9320f08e7f80c7c0a2d26df588d777ceed5d28e Mon Sep 17 00:00:00 2001 From: "asciidoctor-updateclibot[bot]" Date: Sat, 9 Dec 2023 00:01:59 +0000 Subject: [PATCH 1/7] 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 28b1772f..2ba1b420 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.18.5 +ALPINE_VERSION=3.19.0 ASCIIDOCTOR_VERSION=2.0.20 ASCIIDOCTOR_CONFLUENCE_VERSION=0.0.2 ASCIIDOCTOR_PDF_VERSION=2.3.10 From 16f59a2b6e4d0bf63ce3e9b74848d4452db4b3e4 Mon Sep 17 00:00:00 2001 From: "asciidoctor-updateclibot[bot]" Date: Sat, 9 Dec 2023 00:02:00 +0000 Subject: [PATCH 2/7] 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 0e74abd0..bdf4bfdb 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.18.5 +ARG alpine_version=3.19.0 FROM alpine:${alpine_version} AS base # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # From 1d2259f20cc98520622808abb14669bf4844fa2d Mon Sep 17 00:00:00 2001 From: "asciidoctor-updateclibot[bot]" Date: Sat, 9 Dec 2023 00:02:01 +0000 Subject: [PATCH 3/7] 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 fc61069c..15ff96e4 100644 --- a/README.adoc +++ b/README.adoc @@ -1,4 +1,4 @@ -:ALPINE_VERSION: 3.18.5 +:ALPINE_VERSION: 3.19.0 :ASCIIDOCTOR_VERSION: 2.0.20 :ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2 :ASCIIDOCTOR_PDF_VERSION: 2.3.10 From 0c6614ce4c880664943fbad08869c6c2e494650f Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Wed, 13 Dec 2023 11:05:18 +0100 Subject: [PATCH 4/7] fixup: switch to pipx to install python diagram apps instead of system python or virtualenv Signed-off-by: Damien Duportal --- Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index bdf4bfdb..56b2d1f2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -137,13 +137,13 @@ RUN apk add --no-cache --virtual .rubymakedepends \ RUN apk add --no-cache --virtual .pythonmakedepends \ build-base \ freetype-dev \ + pipx \ python3-dev \ py3-pip \ - && pip3 install --no-cache-dir \ - actdiag \ - 'blockdiag[pdf]' \ - nwdiag \ - seqdiag \ + && pipx install --pip-args='--no-cache-dir' actdiag \ + && pipx install --pip-args='--no-cache-dir' 'blockdiag[pdf]' \ + && pipx install --pip-args='--no-cache-dir' nwdiag \ + && pipx install --pip-args='--no-cache-dir' seqdiag \ && apk del -r --no-cache .pythonmakedepends COPY --from=a2s-builder /app/a2s /usr/local/bin/ From 116e9c9ed1ae1702baed87971c2ee5bbcb0f61c8 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Fri, 12 Jan 2024 10:11:21 +0100 Subject: [PATCH 5/7] fixup: make pipx resources available for all users Signed-off-by: Damien Duportal --- Dockerfile | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/Dockerfile b/Dockerfile index 56b2d1f2..6b0b1a39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -132,18 +132,25 @@ RUN apk add --no-cache --virtual .rubymakedepends \ "asciidoctor-reducer:${ASCIIDOCTOR_REDUCER_VERSION}" \ && apk del -r --no-cache .rubymakedepends +# 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 +ENV PIPX_HOME=/opt/pipx +ENV PIPX_BIN_DIR=/usr/local/bin +ENV PIPX_MAN_DIR=/usr/local/share/man + ## Always use the latest dependencies versions available for the current Alpine distribution # hadolint ignore=DL3018,DL3013 -RUN apk add --no-cache --virtual .pythonmakedepends \ - build-base \ - freetype-dev \ - pipx \ - python3-dev \ - py3-pip \ - && pipx install --pip-args='--no-cache-dir' actdiag \ - && pipx install --pip-args='--no-cache-dir' 'blockdiag[pdf]' \ - && pipx install --pip-args='--no-cache-dir' nwdiag \ - && pipx install --pip-args='--no-cache-dir' seqdiag \ +RUN apk add --no-cache \ + pipx \ + py3-pip \ + && apk add --no-cache --virtual .pythonmakedepends \ + build-base \ + freetype-dev \ + python3-dev \ + && pipx install --system-site-packages --pip-args='--no-cache-dir' actdiag \ + && pipx install --system-site-packages --pip-args='--no-cache-dir' 'blockdiag[pdf]' \ + && pipx install --system-site-packages --pip-args='--no-cache-dir' nwdiag \ + && pipx install --system-site-packages --pip-args='--no-cache-dir' seqdiag \ && apk del -r --no-cache .pythonmakedepends COPY --from=a2s-builder /app/a2s /usr/local/bin/ From 0034ac0c36a1d166ed82c28cbe08e84566823ca0 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Tue, 16 Jan 2024 20:05:01 +0100 Subject: [PATCH 6/7] fixup: pin python pillow to 9.5.0 Signed-off-by: Damien Duportal --- Dockerfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6b0b1a39..bae6db39 100644 --- a/Dockerfile +++ b/Dockerfile @@ -69,7 +69,6 @@ RUN apk add --no-cache \ openjdk17-jre \ python3 \ py3-cairo \ - py3-pillow \ py3-setuptools \ ruby-bigdecimal \ ruby-mathematical \ @@ -147,11 +146,14 @@ RUN apk add --no-cache \ build-base \ freetype-dev \ python3-dev \ - && pipx install --system-site-packages --pip-args='--no-cache-dir' actdiag \ - && pipx install --system-site-packages --pip-args='--no-cache-dir' 'blockdiag[pdf]' \ - && pipx install --system-site-packages --pip-args='--no-cache-dir' nwdiag \ - && pipx install --system-site-packages --pip-args='--no-cache-dir' seqdiag \ - && apk del -r --no-cache .pythonmakedepends + && for pipx_app in \ + actdiag \ + 'blockdiag[pdf]' \ + nwdiag \ + seqdiag \ + ;do pipx install --system-site-packages --pip-args='--no-cache-dir' "${pipx_app}"; \ + pipx runpip "$(echo "$pipx_app" | cut -d'[' -f1)" install Pillow==9.5.0; done \ +&& apk del -r --no-cache .pythonmakedepends COPY --from=a2s-builder /app/a2s /usr/local/bin/ COPY --from=erd-builder /app/erd-go /usr/local/bin/ From 350ffa31e37c2b5e41807f7b2694f21df8dba897 Mon Sep 17 00:00:00 2001 From: Damien Duportal Date: Tue, 16 Jan 2024 20:05:50 +0100 Subject: [PATCH 7/7] fixup Signed-off-by: Damien Duportal --- Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Dockerfile b/Dockerfile index bae6db39..48b049f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -152,6 +152,7 @@ RUN apk add --no-cache \ nwdiag \ seqdiag \ ;do pipx install --system-site-packages --pip-args='--no-cache-dir' "${pipx_app}"; \ + # Pin pillow to 9.5.0 as per https://github.com/asciidoctor/docker-asciidoctor/pull/403#issuecomment-1894323894 pipx runpip "$(echo "$pipx_app" | cut -d'[' -f1)" install Pillow==9.5.0; done \ && apk del -r --no-cache .pythonmakedepends