diff --git a/README.asciidoc b/README.asciidoc new file mode 100644 index 0000000..0b63f54 --- /dev/null +++ b/README.asciidoc @@ -0,0 +1 @@ += Flow Services diff --git a/README.md b/README.md deleted file mode 100644 index c57bca5..0000000 --- a/README.md +++ /dev/null @@ -1 +0,0 @@ -# Flow Services diff --git a/templates/forgejo/Dockerfile.gotmpl b/templates/forgejo/Dockerfile.gotmpl index d6d1c74..6c7d8d3 100644 --- a/templates/forgejo/Dockerfile.gotmpl +++ b/templates/forgejo/Dockerfile.gotmpl @@ -1,6 +1,6 @@ # This is a custom made Dockerfile for Gitea which is inspired from # the official Dockerfile.rootless from https://github.com/go-gitea/gitea/ -FROM alpine:3.17 +FROM alpine:3.18 ENV FORGEJO_WORK_DIR={{ .Forgejo.Work }} \ FORGEJO_CUSTOM={{ .Forgejo.Custom }} \ @@ -10,6 +10,7 @@ ENV FORGEJO_WORK_DIR={{ .Forgejo.Work }} \ HOME={{ .Forgejo.Home }} RUN apk update && apk upgrade && apk --no-cache add \ + asciidoctor \ bash \ ca-certificates \ gettext \ diff --git a/templates/forgejo/app.ini.gotmpl b/templates/forgejo/app.ini.gotmpl index a267111..99ac903 100644 --- a/templates/forgejo/app.ini.gotmpl +++ b/templates/forgejo/app.ini.gotmpl @@ -12,9 +12,14 @@ LOCAL_COPY_PATH = {{ .Forgejo.Tmp }}/local-repo [repository.upload] TEMP_PATH = {{ .Forgejo.Tmp }}/uploads +[repository.pull-request] +DEFAULT_MERGE_STYLE = squash + [repository.signing] +SIGNING_KEY = default INITIAL_COMMIT = pubkey, twofa MERGES = pubkey, twofa, basesigned, commitssigned +WIKI = never [ui] DEFAULT_THEME = forgejo-dark @@ -52,6 +57,7 @@ HOST = localhost:3306 NAME = gitea USER = gitea PASSWD = +LOG_SQL = false [indexer] ISSUE_INDEXER_PATH = {{ .Forgejo.DataContainerDirectory }}/indexers/issues.bleve @@ -112,3 +118,10 @@ JWT_SECRET = {{ .Forgejo.Oauth2JwtSecret }} [federation] ENABLED = true + +[markup.asciidoc] +ENABLED = true +FILE_EXTENSIONS = .adoc,.asciidoc +RENDER_COMMAND = "asciidoctor -s -a showtitle --out-file=- -" +; Input is not a standard input but a file +IS_INPUT_FILE = false