Skip to content

Commit 30b98fe

Browse files
Merge branch 'main' into update-dockerfile
2 parents c2b6656 + 16c163d commit 30b98fe

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Golang version defined in https://github.com/kaishuu0123/erd-go/blob/${ERD_VERSION}/go.mod#L3
22
ARG ERD_GOLANG_BUILDER_TAG=1.25-alpine3.22
33
ARG A2S_GOLANG_BUILDER_TAG=1.25-alpine3.22
4-
ARG alpine_version=3.22.1
4+
ARG alpine_version=3.22.2
55
FROM alpine:${alpine_version} AS base
66

77
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
@@ -13,7 +13,7 @@ FROM base AS main-minimal
1313
LABEL maintainers="Guillaume Scheibel <[email protected]>, Damien DUPORTAL <[email protected]>"
1414
LABEL org.opencontainers.image.source="https://github.com/asciidoctor/docker-asciidoctor"
1515

16-
ARG asciidoctor_version=2.0.23
16+
ARG asciidoctor_version=2.0.24
1717
ARG asciidoctor_pdf_version=2.3.21
1818

1919
ENV ASCIIDOCTOR_VERSION=${asciidoctor_version} \

README.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
:ALPINE_VERSION: 3.22.1
2-
:ASCIIDOCTOR_VERSION: 2.0.23
1+
:ALPINE_VERSION: 3.22.2
2+
:ASCIIDOCTOR_VERSION: 2.0.24
33
:ASCIIDOCTOR_CONFLUENCE_VERSION: 0.0.2
44
:ASCIIDOCTOR_PDF_VERSION: 2.3.21
55
:ASCIIDOCTOR_DIAGRAM_VERSION: 3.0.1

tests/asciidoctor.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#!/usr/bin/env bats
22

33
TMP_GENERATION_DIR="${BATS_TEST_DIRNAME}/tmp"
4-
ALPINE_VERSION=3.22.1
5-
ASCIIDOCTOR_VERSION=2.0.23
4+
ALPINE_VERSION=3.22.2
5+
ASCIIDOCTOR_VERSION=2.0.24
66
ASCIIDOCTOR_CONFLUENCE_VERSION=0.0.2
77
ASCIIDOCTOR_PDF_VERSION=2.3.21
88
ASCIIDOCTOR_DIAGRAM_VERSION=3.0.1

0 commit comments

Comments
 (0)