Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bump Alpine Linux Version to 3.20.0 #449

Merged
merged 4 commits into from
Jun 4, 2024
Merged

Bump Alpine Linux Version to 3.20.0 #449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f74b5f
chore: Update the key ALPINE_VERSION in the README.adoc file
asciidoctor-updateclibot[bot] Jun 4, 2024
f2da621
chore: Update the key ALPINE_VERSION in the test harness
asciidoctor-updateclibot[bot] Jun 4, 2024
932369d
chore: Update the value of the base image (ARG alpine_version) in the...
asciidoctor-updateclibot[bot] Jun 4, 2024
f9cb0e9
fixup: ensure jpeg dev. headers are present to allow py-pillow 9.5 to…
dduportal Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -150,6 +153,7 @@ RUN apk add --no-cache \
build-base \
freetype-dev \
python3-dev \
jpeg-dev \
&& for pipx_app in \
actdiag \
'blockdiag[pdf]' \
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion README.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion tests/asciidoctor.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down