Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ COPY ./entrypoint.sh /entrypoint.sh

# Add permissions to execute entrypoint
RUN chmod +x /entrypoint.sh
# install extra antora generators for documentation search and plantuml rendering
RUN npm i -g asciidoctor-plantuml asciidoctor-kroki @antora/lunr-extension
# install extra antora extensions for documentation search and diagram rendering
RUN npm i -g asciidoctor-kroki @antora/lunr-extension

ENTRYPOINT ["/entrypoint.sh"]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ GitHub action that can be used to generate the [Antora](https://antora.org/) sit

Supported Antora version: *>= 3.0.0*

Supported rendering plugins: *asciidoctor-plantuml*, *asciidoctor-kroki*
Supported rendering plugins: *asciidoctor-kroki*

Supported extensions: *@antora/lunr-extension*

Expand Down
8 changes: 4 additions & 4 deletions action.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: "Antora Site"
description: "Generate the Antora site with PlantUML and Kroki diagram support"
description: "Generate the Antora site with Kroki diagram support"
branding:
icon: book-open
color: yellow
Expand Down Expand Up @@ -30,13 +30,13 @@ runs:
- name: Set up Docker Compose
uses: docker/setup-compose-action@364cc21a5de5b1ee4a7f5f9d3fa374ce0ccde746 # v1.2.0

- name: Generate Antora site with PlantUML and Kroki
- name: Generate Antora site with Kroki
shell: bash
run: |
cd ${{ github.action_path }}

# Start diagram servers (PlantUML, Kroki, Mermaid)
docker compose up -d plantuml mermaid kroki
# Start diagram servers (Kroki, Mermaid)
docker compose up -d mermaid kroki

docker compose run --rm \
-e INPUT_SITE_SOURCES_PATH="${{ inputs.site_sources_path }}" \
Expand Down
17 changes: 0 additions & 17 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,4 @@
services:
plantuml:
image: docker.io/plantuml/plantuml-server:jetty@sha256:ac656ab4215fd80554c59330fd365a3b29041e317f232563c7fc807680ec4ef0
container_name: plantuml-server
ports:
- "8000:8080"
networks:
- antora-network
healthcheck:
test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:8080/ || exit 1"]
interval: 10s
timeout: 5s
retries: 5
start_period: 20s

mermaid:
image: yuzutech/kroki-mermaid:0.28.0@sha256:e301872d57b397e1020768cfbafd3ac5d3f2c47a2615d65b9af217c832a226f4
container_name: mermaid-server
Expand Down Expand Up @@ -43,14 +29,11 @@ services:
dockerfile: Dockerfile
container_name: antora-generator
depends_on:
plantuml:
condition: service_healthy
kroki:
condition: service_healthy
networks:
- antora-network
environment:
- PLANTUML_SERVER_URL=http://plantuml:8080
- KROKI_SERVER_URL=http://kroki:8000

networks:
Expand Down
1 change: 0 additions & 1 deletion entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,5 @@ antora \
--generator $INPUT_ANTORA_GENERATOR \
--fetch $INPUT_ANTORA_PLAYBOOK \
--attribute kroki-server-url=$KROKI_SERVER_URL \
--attribute plantuml-server-url=$PLANTUML_SERVER_URL \
--attribute kroki-fetch-diagram=true \
--stacktrace $INPUT_ANTORA_ADDITIONAL_ARGUMENTS
Loading