Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
9c43d4b
Update dbml-renderer (#1448)
bobzomer Feb 26, 2023
f96faaa
Fix GitLab capitalization (#1454)
fdmarcin Mar 6, 2023
eea3dbf
Update UMlet to 15.0.0 (#1456)
ggrossetie Mar 8, 2023
dfce464
Fixing typos (#1458)
deining Mar 10, 2023
583a3df
Update excalidraw (#1453)
sleiner Mar 11, 2023
3f1930c
Docs, diagram options: remove duplicate sections (#1463)
urban-adeininger Mar 13, 2023
a2e21f1
D2: fix incorrect color number for theme 'Neutral grey' (#1467)
deining Mar 13, 2023
f11d934
Prepare release
ggrossetie Mar 18, 2023
3d6f5d2
Release 0.20.0
ggrossetie Mar 18, 2023
f14da28
Enable PDF output for Erd and GraphViz
ggrossetie Mar 18, 2023
27d58f9
chore(deps): update dependency markupsafe to v2.1.2 (#1436)
ggrossetie Mar 18, 2023
ed566cb
add missing font package to wireviz container (#1478)
copyrights Mar 18, 2023
1a8a07b
Wireviz: Cleanup requirements; update Flask and Werkzeug to 2.2.3 (#1…
copyrights Mar 19, 2023
689f0da
Documentation: clarify use of diagram options that act as flags (#1469)
urban-adeininger Mar 19, 2023
488cfc4
Use Ubuntu base image for main container (#1476)
felixvanoost Mar 25, 2023
a08cdfc
Use UMlet as a native binary instead of a Java library (#1486)
ggrossetie Mar 26, 2023
47f5b72
resolves #1449 allow to configure additional allowed headers (CORS) u…
ggrossetie Mar 26, 2023
6e24757
Update Maven plugins (#1493)
ggrossetie Mar 29, 2023
a6cede5
Update Node dependencies (#1494)
ggrossetie Mar 29, 2023
e63bd66
Update Python dependencies (#1491)
ggrossetie Mar 29, 2023
2d5bc96
Update GitHub Actions (#1492)
ggrossetie Mar 29, 2023
7216bf1
Update Structurizr packages (#1495)
ggrossetie Mar 29, 2023
b039f17
Add PGF/TikZ support (#1440)
rfdonnelly Mar 29, 2023
5f4a8c2
Update dependency Pillow to v9.5.0 (#1502)
ggrossetie Apr 2, 2023
cb225f6
Update Structurizr packages (#1500)
ggrossetie Apr 2, 2023
7ddf4c4
Update Java dependencies (#1490)
ggrossetie Apr 2, 2023
ef1febb
Update GitHub Actions (#1507)
ggrossetie Apr 14, 2023
564cb8c
Update Structurizr packages (#1506)
ggrossetie Apr 14, 2023
ca6442c
Update dependency canvas to v2.11.2 (#1503)
ggrossetie Apr 14, 2023
9cd4a45
Build arm64 main image (#1487)
felixvanoost Apr 16, 2023
58792c3
Update dependency vega-lite to v5.7.0 (#1514)
ggrossetie Apr 16, 2023
8a2f394
Use boolean value
ggrossetie Apr 18, 2023
c5e095e
Remove travis build badge
ggrossetie Apr 18, 2023
b99a464
Update Rust crate svgbob_cli to 0.7.0 (#1513)
ggrossetie Apr 18, 2023
28f4250
Documentation: complete available themes for d2 diagrams (#1511)
deining Apr 18, 2023
fd5b64f
Allow SSL certificate to be passed as a file path (#1517)
felixvanoost Apr 21, 2023
9b4b3fd
Update Java dependencies to v1.4.7 (#1519)
ggrossetie Apr 21, 2023
c3f18b1
resolves #1480 Use PlantUML as native image (#1515)
ggrossetie Apr 23, 2023
c2013f7
resolves #1510 Add D2 sketch option (#1520)
felixvanoost Apr 25, 2023
711fd86
Install arm64-compatible Node packages (#1523)
felixvanoost Apr 27, 2023
b7ec206
Update Java testing packages to v5.9.3 (#1528)
ggrossetie Apr 27, 2023
3f3d14e
Update excalidraw to 0.15.2 (#1527)
Lazzaretti Apr 27, 2023
cadffdd
Add maven wrapper (#1530)
tegorov Apr 29, 2023
f32e067
Use pre-built binary for GraphViz (#1522)
ggrossetie May 1, 2023
1ee2401
Update Python dependencies (#1525)
ggrossetie May 1, 2023
a542857
Remove duplicated line
ggrossetie May 1, 2023
834f6aa
Replace JPEG by PDF for PlantUML, C4 PlantUML and Structurizr (#1536)
ggrossetie May 7, 2023
1b20a0d
resolves #1521 use native image of Ditaa (#1537)
ggrossetie May 7, 2023
1e45650
resolves #1441 add Netty native transport (to use socket listening) (…
ggrossetie May 8, 2023
a96d8de
Enable structurizr tests (#1539)
ggrossetie May 8, 2023
f0e5227
Remove deprecated installLocalDependencies workflow step (#1540)
felixvanoost May 9, 2023
70cba6c
Update Java dependencies (#1541)
ggrossetie May 14, 2023
7d34445
Update dependency org.apache.maven.plugins:maven-surefire-plugin to v…
ggrossetie May 14, 2023
c3e21a4
resolves #1543 add default theme and latest version of oracle, aws an…
ggrossetie May 14, 2023
c4aaf64
Update d2 version in documentation
ggrossetie May 14, 2023
97eba3e
add OCI labels to Kroki Dockerfile (#1545)
mikaello May 18, 2023
c01c5ef
Version 0.21.0
ggrossetie May 18, 2023
192e467
Add missing Docker arguments for arm64 builds (#1548)
felixvanoost May 19, 2023
dd7bab4
resolves #1546 upgrade PlantUML to v1.2023.7 (#1549)
ggrossetie May 19, 2023
a923b42
Update Node dependencies (#1397)
ggrossetie May 19, 2023
1e88a8c
Update versions
ggrossetie May 20, 2023
6095b70
Version 0.21.1
ggrossetie May 20, 2023
cef14b6
Fix release step
ggrossetie May 20, 2023
c896758
Version 0.21.2
ggrossetie May 20, 2023
80601b4
Remove extra v
ggrossetie May 20, 2023
e81900a
Improve error code status (#1552)
ggrossetie May 23, 2023
353e526
Remove console.log
ggrossetie May 23, 2023
5a6dcdd
Version 0.21.3
ggrossetie May 27, 2023
147d832
D2 diagrams: document option 'sketch' (#1558)
deining Jun 2, 2023
48e510e
Revert "D2 diagrams: document option 'sketch' (#1558)" (#1559)
ggrossetie Jun 2, 2023
b195d56
Export standalone SVG for diagrams.net (including width, height and v…
ggrossetie Jun 3, 2023
81f4140
Linter hapiness
ggrossetie Jun 3, 2023
71d30e5
Correct spelling of D2 theme (#1560)
deining Jun 4, 2023
e630c3a
Update actions/checkout action to v3.5.3 (#1567)
ggrossetie Jun 10, 2023
8c92218
Update dependency org.apache.maven.plugins:maven-surefire-plugin to v…
ggrossetie Jun 10, 2023
a0361e1
Update Java dependencies (#1555)
ggrossetie Jun 10, 2023
5114015
Update GraphViz to 8.0.5 (#1568)
ggrossetie Jun 10, 2023
20e7395
Update Java dependencies to v1.4.8 (#1571)
ggrossetie Jun 14, 2023
8a0e558
Upgrade Mermaid to 10.2.3 (#1573)
ggrossetie Jun 14, 2023
d8de94d
resolves #1561 add logger in kroki-excalidraw (#1569)
ggrossetie Jun 14, 2023
6a38fb8
Mermaid: Upgrade Alpine to 3.18 (#1574)
ggrossetie Jun 14, 2023
f8a0d82
Upgrade to Alpine 3.18 (#1575)
ggrossetie Jun 14, 2023
26de4e9
Upgrade to Alpine 3.18 (#1576)
ggrossetie Jun 14, 2023
e418635
Invalid CORS now returns a 403 (instead of 500) (#1577)
ggrossetie Jun 15, 2023
f3caeaf
Allow to enable observability (APM, transactions, spans) (#1578)
ggrossetie Jun 17, 2023
c8f3e4e
Update dependency org.apache.maven.plugins:maven-shade-plugin to v3.5…
ggrossetie Jun 17, 2023
285498c
Adding a health check that can be used to determine if the worker is …
bra1nDump Jun 17, 2023
b805b05
Update Structurizr packages (#1581)
ggrossetie Jun 23, 2023
d68b006
Update peter-evans/dockerhub-description action to v3.4.2 (#1582)
ggrossetie Jun 23, 2023
ef4ebc9
feat: added C# example to Encode Diagrams (#1585)
woutervanranst Jul 14, 2023
ef19b33
Update dependency com.structurizr:structurizr-dsl to v1.30.3 (#1588)
ggrossetie Jul 14, 2023
2f42e78
Update Java dependencies (#1580)
ggrossetie Jul 14, 2023
c759405
Update Python dependencies (#1532)
ggrossetie Jul 14, 2023
e445ac3
Update dependency rust to v1.71 (#1389)
ggrossetie Jul 14, 2023
5445d15
Update D2 to 0.5.1 (#1583)
loganmzz Jul 14, 2023
482f7dc
Add symbolator (#1566)
zebreus Jul 14, 2023
4e3ca68
resolves #1586 preserve workspace styles while applying theme (#1592)
ggrossetie Jul 14, 2023
2b20ac9
Fix wireviz build due to pyyaml install failure (#1608)
rlespinasse Aug 2, 2023
9823c6b
resolves #1604 upgrade C4 PlantUML definition files to 2.7.0 (#1605)
rlespinasse Aug 2, 2023
22558e0
Fix #1602: Error with diagramsnet, when using parameters (#1609)
Heiss Aug 6, 2023
5adac1c
Add D2 layout engine option (#1570)
felixvanoost Aug 11, 2023
a7b6b36
Add PlantUML no-metadata option (#1611)
felixvanoost Aug 13, 2023
302298b
Update Structurizr packages (#1594)
ggrossetie Aug 13, 2023
7762aca
chore(deps): update python dependencies (#1595)
ggrossetie Aug 13, 2023
a527a4c
Update Java dependencies (#1597)
ggrossetie Aug 13, 2023
1931ad1
Update Structurizr error message in test
ggrossetie Aug 13, 2023
09f14c9
chore(deps): update actions/setup-java action to v3.12.0 (#1600)
ggrossetie Aug 14, 2023
c03064d
Use blockdiag native images (#1613)
ggrossetie Aug 14, 2023
aed6e1d
chore(deps): update dependency werkzeug to v2.3.7 (#1614)
ggrossetie Aug 15, 2023
6aa568e
resolves #1606 upgrade PlantUML to 1.2023.10 (#1615)
ggrossetie Aug 15, 2023
867c220
Version 0.22.0
ggrossetie Aug 16, 2023
db57781
chore(deps): update dependency click to v8.1.7 (#1617)
ggrossetie Aug 20, 2023
a0af394
resolves #1553 extract error message (#1616)
ggrossetie Aug 20, 2023
fe8218c
chore(deps): update node dependencies (#1516)
ggrossetie Aug 20, 2023
f0fd797
Fix free disk space action (#1620)
ggrossetie Aug 20, 2023
66a0bc3
Extract error message/stack (#1619)
ggrossetie Aug 20, 2023
ada0199
build server inside container build pipeline
Mar 25, 2023
68c3e1d
ignore missing .git directory
Mar 25, 2023
6af8f37
do not build server outside container build
Mar 25, 2023
141e6aa
rebase changes
Mar 28, 2023
f3db2fa
adoptions after rebase
Aug 20, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
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
23 changes: 7 additions & 16 deletions .github/workflows/dockerhub-description.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ jobs:
docker-hub-description:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3.3.0
- uses: actions/checkout@v3.5.3

- name: Docker Hub Description
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -21,7 +21,7 @@ jobs:
readme-filepath: ./DOCKERHUB.md

- name: Docker Hub Description - bpmn
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -30,7 +30,7 @@ jobs:
readme-filepath: ./DOCKERHUB-COMPANION.md

- name: Docker Hub Description - excalidraw
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -39,25 +39,16 @@ jobs:
readme-filepath: ./DOCKERHUB-COMPANION.md

- name: Docker Hub Description - mermaid
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
repository: yuzutech/kroki-mermaid
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.1.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.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand All @@ -66,7 +57,7 @@ jobs:
readme-filepath: ./DOCKERHUB-COMPANION.md

- name: Docker Hub Description - wireviz
uses: peter-evans/dockerhub-description@v3.1.2
uses: peter-evans/dockerhub-description@v3.4.2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ jobs:
run: ./kind delete cluster

test-dockercompose:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04

steps:
- uses: actions/checkout@v3
Expand Down
185 changes: 174 additions & 11 deletions .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,30 +11,193 @@ on:
- 'docs/**'
branches:
- '*'
workflow_call:
inputs:
build_multiarch:
default: false
required: true
type: boolean

jobs:
test-containers:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Free up disk space
if: ${{ inputs.build_multiarch }}
shell: bash
# workaround: https://github.com/jlumbroso/free-disk-space/issues/9
# copied from https://github.com/hirnidrin/free-disk-space/blob/4bacba7c412c8ace26b87b5b79977da05137e69d/action.yml
run: |
# ======
# MACROS
# ======

- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: 11
distribution: temurin
# macro to print a line of equals
# (silly but works)
printSeparationLine() {
str=${1:=}
num=${2:-80}
counter=1
output=""
while [ $counter -le $num ]
do
output="${output}${str}"
counter=$((counter+1))
done
echo "${output}"
}

# macro to compute available space
# REF: https://unix.stackexchange.com/a/42049/60849
# REF: https://stackoverflow.com/a/450821/408734
getAvailableSpace() { echo $(df -a $1 | awk 'NR > 1 {avail+=$4} END {print avail}'); }

# macro to make Kb human readable (assume the input is Kb)
# REF: https://unix.stackexchange.com/a/44087/60849
formatByteCount() { echo $(numfmt --to=iec-i --suffix=B --padding=7 $1'000'); }

# macro to output saved space
printSavedSpace() {
saved=${1}
title=${2:-}

echo ""
printSeparationLine '*' 80
if [ ! -z "${title}" ]; then
echo "=> ${title}: Saved $(formatByteCount $saved)"
else
echo "=> Saved $(formatByteCount $saved)"
fi
printSeparationLine '*' 80
echo ""
}

# macro to print output of dh with caption
printDH() {
caption=${1:-}

printSeparationLine '=' 80
echo "${caption}"
echo ""
echo "$ dh -h /"
echo ""
df -h /
echo "$ dh -a /"
echo ""
df -a /
echo "$ dh -a"
echo ""
df -a
printSeparationLine '=' 80
}

# ======
# SCRIPT
# ======

# Display initial disk space stats

AVAILABLE_INITIAL=$(getAvailableSpace)
AVAILABLE_ROOT_INITIAL=$(getAvailableSpace '/')

printDH "BEFORE CLEAN-UP:"
echo ""

# Remove Android library
BEFORE=$(getAvailableSpace)

sudo rm -rf /usr/local/lib/android

AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Android library"

BEFORE=$(getAvailableSpace)

# https://github.community/t/bigger-github-hosted-runners-disk-space/17267/11
sudo rm -rf /usr/share/dotnet

AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED ".NET runtime"

BEFORE=$(getAvailableSpace)

- name: Install Java dependencies
run: make installLocalDependencies
sudo rm -rf /opt/ghc

- name: Build Java server
run: make buildServer
AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Haskell runtime"

# Remove large packages
# REF: https://github.com/apache/flink/blob/master/tools/azure-pipelines/free_disk_space.sh

BEFORE=$(getAvailableSpace)

sudo apt-get remove -y '^aspnetcore-.*'
sudo apt-get remove -y '^dotnet-.*'
sudo apt-get remove -y '^llvm-.*'
sudo apt-get remove -y 'php.*'
sudo apt-get remove -y '^mongodb-.*'
sudo apt-get remove -y '^mysql-.*'
sudo apt-get remove -y azure-cli google-cloud-sdk google-chrome-stable firefox powershell mono-devel libgl1-mesa-dri
sudo apt-get autoremove -y
sudo apt-get clean

AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Large misc. packages"

# Remove Docker images
BEFORE=$(getAvailableSpace)

sudo docker image prune --all --force

AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Docker images"

# Remove Swap storage
BEFORE=$(getAvailableSpace)

sudo swapoff -a
sudo rm -f /mnt/swapfile
free -h

AFTER=$(getAvailableSpace)
SAVED=$((AFTER-BEFORE))
printSavedSpace $SAVED "Swap storage"

# Output saved space statistic

AVAILABLE_END=$(getAvailableSpace)
AVAILABLE_ROOT_END=$(getAvailableSpace '/')

echo ""
printDH "AFTER CLEAN-UP:"

echo ""
echo ""

echo "/dev/root:"
printSavedSpace $((AVAILABLE_ROOT_END - AVAILABLE_ROOT_INITIAL))
echo "overall:"
printSavedSpace $((AVAILABLE_END - AVAILABLE_INITIAL))

- name: Install GraphViz
run: sudo apt-get install graphviz -y

- name: Set up QEMU
if: ${{ inputs.build_multiarch }}
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
with:
config-inline: |
[worker.oci]
max-parallelism = 2

- name: Cache Docker layers
uses: actions/cache@v3
Expand All @@ -47,6 +210,7 @@ jobs:
- name: Build container images
run: make buildDockerImages
env:
BUILD_MULTIARCH: ${{ inputs.build_multiarch }}
CACHE_FROM: 'type=local,src=/tmp/.buildx-cache'
CACHE_TO: 'type=local,dest=/tmp/.buildx-cache-new'

Expand All @@ -69,4 +233,3 @@ jobs:
run: |
rm -rf /tmp/.buildx-cache
mv /tmp/.buildx-cache-new /tmp/.buildx-cache

11 changes: 11 additions & 0 deletions .github/workflows/nightly.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: CI (nightly)

on:
schedule:
- cron: '0 2 * * *'

jobs:
test-containers-multiarch:
uses: ./.github/workflows/main.yaml
with:
build_multiarch: true
Loading