@@ -28,7 +28,7 @@ RUN apk add --no-cache ruby \
28
28
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
29
29
# Install erd-go (https://github.com/kaishuu0123/erd-go) as replacement for erd (https://github.com/BurntSushi/erd)
30
30
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
31
- FROM golang:${ERD_GOLANG_BUILDER_TAG} as erd-builder
31
+ FROM golang:${ERD_GOLANG_BUILDER_TAG} AS erd-builder
32
32
ARG ERD_VERSION=v2.0.0
33
33
# # Always use the latest git package
34
34
# go install or go get cannot be used the go.mod syntax of erd-go is not following the Golang semver properties,
@@ -43,7 +43,7 @@ RUN CGO_ENABLED=0 GOOS=linux go build
43
43
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
44
44
# Install ASCIIToSVG https://github.com/asciitosvg/asciitosvg
45
45
# # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
46
- FROM golang:${A2S_GOLANG_BUILDER_TAG} as a2s-builder
46
+ FROM golang:${A2S_GOLANG_BUILDER_TAG} AS a2s-builder
47
47
# Expects a git reference as there are no tags in the A2S repository
48
48
ARG A2S_VERSION=ca82a5c
49
49
RUN GOBIN=/app go install github.com/asciitosvg/asciitosvg/cmd/a2s@"${A2S_VERSION}"
@@ -87,9 +87,8 @@ RUN apk add --no-cache \
87
87
tzdata \
88
88
unzip \
89
89
which \
90
- font-noto-cjk
91
-
92
- RUN apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
90
+ font-noto-cjk \
91
+ && apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing \
93
92
pdf2svg
94
93
95
94
ARG asciidoctor_confluence_version=0.0.2
@@ -165,22 +164,22 @@ ENV PIPX_MAN_DIR=/usr/local/share/man
165
164
# # Always use the latest dependencies versions available for the current Alpine distribution
166
165
# hadolint ignore=DL3018,DL3013
167
166
RUN apk add --no-cache \
168
- pipx \
169
- py3-pip \
167
+ pipx \
168
+ py3-pip \
170
169
&& apk add --no-cache --virtual .pythonmakedepends \
171
- build-base \
172
- freetype-dev \
173
- python3-dev \
174
- jpeg-dev \
170
+ build-base \
171
+ freetype-dev \
172
+ python3-dev \
173
+ jpeg-dev \
175
174
&& for pipx_app in \
176
- actdiag \
177
- 'blockdiag[pdf]' \
178
- nwdiag \
179
- seqdiag \
175
+ actdiag \
176
+ 'blockdiag[pdf]' \
177
+ nwdiag \
178
+ seqdiag \
180
179
;do pipx install --system-site-packages --pip-args='--no-cache-dir' "${pipx_app}" ; \
181
180
# Pin pillow to 9.5.0 as per https://github.com/asciidoctor/docker-asciidoctor/pull/403#issuecomment-1894323894
182
181
pipx runpip "$(echo " $pipx_app" | cut -d'[' -f1)" install Pillow==9.5.0; done \
183
- && apk del -r --no-cache .pythonmakedepends
182
+ && apk del -r --no-cache .pythonmakedepends
184
183
185
184
COPY --from=a2s-builder /app/a2s /usr/local/bin/
186
185
COPY --from=erd-builder /app/erd-go /usr/local/bin/
0 commit comments