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.

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

Use blockdiag native images #1613

Merged
merged 3 commits into from
Aug 14, 2023
Merged
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
29 changes: 0 additions & 29 deletions .github/workflows/blockdiag-ci.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/cve-scan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
continue-on-error: true
strategy:
matrix:
image: [ kroki, kroki-mermaid, kroki-bpmn, kroki-excalidraw, kroki-blockdiag, kroki-diagramsnet, kroki-wireviz ]
image: [ kroki, kroki-mermaid, kroki-bpmn, kroki-excalidraw, kroki-diagramsnet, kroki-wireviz ]
tag: [ latest ]
steps:
- name: Run Trivy vulnerability scanner
Expand Down
9 changes: 0 additions & 9 deletions .github/workflows/dockerhub-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,6 @@ jobs:
short-description: Companion server for Kroki that provides Mermaid
readme-filepath: ./DOCKERHUB-COMPANION.md

- name: Docker Hub Description - blockdiag
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: yuzutech/kroki-blockdiag
short-description: Companion server for Kroki that provides BlockDiag, SeqDiag, ActDiag, NwDiag, PacketDiag and RackDiag
readme-filepath: ./DOCKERHUB-COMPANION.md

- name: Docker Hub Description - diagramsnet
uses: peter-evans/dockerhub-description@v3.4.2
with:
Expand Down
8 changes: 1 addition & 7 deletions DOCKERHUB.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,19 @@ This image includes `EXPOSE 8000` (the kroki port), so standard container linkin
#### connect with companion containers

We recommend using docker-composer to connect with companion containers, such as
[kroki-bpmn](https://hub.docker.com/r/yuzutech/kroki-bpmn), [kroki-blockdiag](https://hub.docker.com/r/yuzutech/kroki-blockdiag), [kroki-excalidraw](https://hub.docker.com/r/yuzutech/kroki-excalidraw) and [kroki-mermaid](https://hub.docker.com/r/yuzutech/kroki-mermaid)
[kroki-bpmn](https://hub.docker.com/r/yuzutech/kroki-bpmn), [kroki-excalidraw](https://hub.docker.com/r/yuzutech/kroki-excalidraw) and [kroki-mermaid](https://hub.docker.com/r/yuzutech/kroki-mermaid)
```
version: "3"
services:
core:
image: yuzutech/kroki
environment:
- KROKI_BLOCKDIAG_HOST=blockdiag
- KROKI_MERMAID_HOST=mermaid
- KROKI_BPMN_HOST=bpmn
- KROKI_EXCALIDRAW_HOST=excalidraw
- KROKI_WIREVIZ_HOST=wireviz
ports:
- "8000:8000"
blockdiag:
image: yuzutech/kroki-blockdiag
ports:
- "8001:8001"
mermaid:
image: yuzutech/kroki-mermaid
ports:
Expand All @@ -69,7 +64,6 @@ If you don't want to use `docker-compose`, you can configure the host and port f

| Container | Host | Port |
|--------------------|-------------------------|-------------------------|
| `kroki-blockdiag` | `KROKI_BLOCKDIAG_HOST` | `KROKI_BLOCKDIAG_PORT` |
| `kroki-mermaid` | `KROKI_MERMAID_HOST` | `KROKI_MERMAID_PORT` |
| `kroki-bpmn` | `KROKI_BPMN_HOST` | `KROKI_BPMN_PORT` |
| `kroki-excalidraw` | `KROKI_EXCALIDRAW_HOST` | `KROKI_EXCALIDRAW_PORT` |
Expand Down
11 changes: 0 additions & 11 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,6 @@ A Node.js CLI on top of the _Nomnoml_ diagram library.
vega::
A Node.js CLI on top of the _vega_ diagram library. Also supports Vega-Lite concise grammar.

blockdiag::
A companion web server written in Python (powered by _Flask_ and _Gunicorn_) that provides _BlockDiag_, _SeqDiag_, _ActDiag_, _NwDiag_, _PacketDiag_ and _RackDiag_ diagrams libraries.

mermaid::
A companion web server written in JavaScript (powered by _micro_) that provides _Mermaid_ diagram library.

Expand Down Expand Up @@ -137,9 +134,6 @@ Once the Docker images are built, you can run Kroki using `docker`:

If you want to use one of the following diagram libraries then you will also need to start the corresponding companion container:

yuzutech/kroki-blockdiag::
BlockDiag, ActDiag, NwDiag, SeqDiag, PacketDiag, RackDiag

yuzutech/kroki-mermaid::
Mermaid

Expand All @@ -165,17 +159,12 @@ services:
core:
image: yuzutech/kroki
environment:
- KROKI_BLOCKDIAG_HOST=blockdiag
- KROKI_MERMAID_HOST=mermaid
- KROKI_BPMN_HOST=bpmn
- KROKI_EXCALIDRAW_HOST=excalidraw
- KROKI_WIREVIZ_HOST=wireviz
ports:
- "8000:8000"
blockdiag:
image: yuzutech/kroki-blockdiag
expose:
- "8001"
mermaid:
image: yuzutech/kroki-mermaid
expose:
Expand Down
3 changes: 0 additions & 3 deletions blockdiag/.dockerignore

This file was deleted.

14 changes: 0 additions & 14 deletions blockdiag/.editorconfig

This file was deleted.

2 changes: 0 additions & 2 deletions blockdiag/.gitignore

This file was deleted.

25 changes: 0 additions & 25 deletions blockdiag/Dockerfile

This file was deleted.

12 changes: 0 additions & 12 deletions blockdiag/Makefile

This file was deleted.

35 changes: 0 additions & 35 deletions blockdiag/README.adoc

This file was deleted.

Loading