Skip to content

Commit

Permalink
Remove ASCIIToSVG because it was added in asciidoctor original image …
Browse files Browse the repository at this point in the history
…1.52.0
  • Loading branch information
barthel committed Aug 3, 2023
1 parent c90a7a6 commit 2a24ee1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 16 deletions.
19 changes: 4 additions & 15 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
ARG ASCIIDOCTOR_BASE_TAG=${CIRCLE_TAG:-latest}
ARG alpine_version=3.18
ARG golang_version=1.20
# Build ASCIIToSVG - @see: https://github.com/asciitosvg/asciitosvg
FROM golang:${golang_version}-alpine${alpine_version} as go-builder

# No branch/tag/version available; pin to the last known commit for now
# https://github.com/asciitosvg/asciitosvg/commit/ca82a5ce41e2190a05e07af6e8b3ea4e3256a283
RUN apk add --no-cache git \
&& go install github.com/asciitosvg/asciitosvg/cmd/a2s@ca82a5ce41e2190a05e07af6e8b3ea4e3256a283


# =========================================
# Build dpic- @see: https://gitlab.com/aplevich/dpic
Expand All @@ -19,11 +10,11 @@ RUN apk add --no-cache \
build-base \
make \
bison \
git
RUN git clone --depth 1 https://gitlab.com/aplevich/dpic.git /dpic \
git \
&& git clone --depth 1 https://gitlab.com/aplevich/dpic.git /dpic \
&& cd /dpic \
&& make PREFIX=local installdpic
RUN git clone --depth 1 -b "master" https://github.com/drhsqlite/pikchr.git /pikchr \
&& make PREFIX=local installdpic \
&& git clone --depth 1 -b "master" https://github.com/drhsqlite/pikchr.git /pikchr \
&& cd /pikchr \
&& make pikchr

Expand All @@ -33,8 +24,6 @@ FROM uwebarthel/asciidoctor-base:${ASCIIDOCTOR_BASE_TAG} as asciidoctor-builder

ENV TMPDIR "/tmp"

# Install ASCIIToSVG
COPY --from=go-builder /go/bin/a2s /usr/local/bin/
# Install dpic
COPY --from=make-builder /usr/local/bin/dpic /usr/local/bin/
# Install pikchr
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ Unfortunately, it is not possible to provide **`armv7`** version greater than [1

The following additional diagram tools are installed:

* [ASCIIToSVG](https://github.com/asciitosvg/asciitosvg)
* [barby](https://github.com/toretore/barby)
* [blockdiag/blockdiag](https://github.com/blockdiag/blockdiag)<sup>[1]</sup>
* [blockdiag/actdiag](https://github.com/blockdiag/actdiag)<sup>[1]</sup>
Expand Down

0 comments on commit 2a24ee1

Please sign in to comment.