diff --git a/.gitea/workflows/docker-publish.yml b/.gitea/workflows/docker-publish.yml index d724aa8..a1eb260 100644 --- a/.gitea/workflows/docker-publish.yml +++ b/.gitea/workflows/docker-publish.yml @@ -24,7 +24,7 @@ jobs: context: . push: true # Hier wird die Git-Referenz automatisch als Docker-Tag genutzt - #tags: gitea.scu.si/florianwalther/password-generator:${{ gitea.ref_name }} + #tags: gitea.scu.si/florianwalther/mdhost:${{ gitea.ref_name }} build-args: | APP_VERSION=${{ gitea.ref_name }} tags: | diff --git a/go.mod b/go.mod index c1ace75..e789b46 100644 --- a/go.mod +++ b/go.mod @@ -3,10 +3,12 @@ module mdhost go 1.26.2 require ( + github.com/yuin/goldmark v1.8.2 + github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 + golang.org/x/crypto v0.50.0 +) + +require ( github.com/alecthomas/chroma v0.10.0 // indirect - github.com/alecthomas/chroma/v2 v2.24.1 // indirect github.com/dlclark/regexp2 v1.12.0 // indirect - github.com/yuin/goldmark v1.8.2 // indirect - github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594 // indirect - golang.org/x/crypto v0.50.0 // indirect ) diff --git a/go.sum b/go.sum index 13779f8..c234b40 100644 --- a/go.sum +++ b/go.sum @@ -1,14 +1,15 @@ github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek= github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s= -github.com/alecthomas/chroma/v2 v2.24.1 h1:m5ffpfZbIb++k8AqFEKy9uVgY12xIQtBsQlc6DfZJQM= -github.com/alecthomas/chroma/v2 v2.24.1/go.mod h1:l+ohZ9xRXIbGe7cIW+YZgOGbvuVLjMps/FYN/CwuabI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc= github.com/dlclark/regexp2 v1.12.0 h1:0j4c5qQmnC6XOWNjP3PIXURXN2gWx76rd3KvgdPkCz8= github.com/dlclark/regexp2 v1.12.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/yuin/goldmark v1.4.5/go.mod h1:rmuwmfZ0+bvzB24eSC//bk1R1Zp3hM0OXYv/G2LIilg= github.com/yuin/goldmark v1.8.2 h1:kEGpgqJXdgbkhcOgBxkC0X0PmoPG1ZyoZ117rDVp4zE= @@ -18,4 +19,5 @@ github.com/yuin/goldmark-highlighting v0.0.0-20220208100518-594be1970594/go.mod golang.org/x/crypto v0.50.0 h1:zO47/JPrL6vsNkINmLoo/PH1gcxpls50DNogFvB5ZGI= golang.org/x/crypto v0.50.0/go.mod h1:3muZ7vA7PBCE6xgPX7nkzzjiUq87kRItoJQM1Yo8S+Q= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/main.go b/main.go index 7a4e0b2..0576215 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ import ( "time" "github.com/yuin/goldmark" + "github.com/yuin/goldmark/extension" "github.com/yuin/goldmark-highlighting" "golang.org/x/crypto/bcrypt" ) @@ -83,9 +84,12 @@ var ( func newMarkdownRenderer() goldmark.Markdown { return goldmark.New( - goldmark.WithExtensions(highlighting.NewHighlighting( - highlighting.WithStyle("github"), - )), + goldmark.WithExtensions( + extension.Table, + highlighting.NewHighlighting( + highlighting.WithStyle("github"), + ), + ), ) } @@ -466,9 +470,17 @@ const css = `