feat(forgejo): update forgejo configuration

- Use alpine 3.18 as the base image for Forgejo.
- Stop logging SQL statements.
- Change the default merge style to 'squash'.
- Add support for converting asciidoc to html.
This commit is contained in:
Dan Anglin 2023-05-22 07:44:03 +01:00
parent bcd67bc3f6
commit 342a0eeb31
Signed by: dananglin
GPG key ID: 0C1D44CFBEE68638
4 changed files with 16 additions and 2 deletions

1
README.asciidoc Normal file
View file

@ -0,0 +1 @@
= Flow Services

View file

@ -1 +0,0 @@
# Flow Services

View file

@ -1,6 +1,6 @@
# This is a custom made Dockerfile for Gitea which is inspired from # This is a custom made Dockerfile for Gitea which is inspired from
# the official Dockerfile.rootless from https://github.com/go-gitea/gitea/ # 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 }} \ ENV FORGEJO_WORK_DIR={{ .Forgejo.Work }} \
FORGEJO_CUSTOM={{ .Forgejo.Custom }} \ FORGEJO_CUSTOM={{ .Forgejo.Custom }} \
@ -10,6 +10,7 @@ ENV FORGEJO_WORK_DIR={{ .Forgejo.Work }} \
HOME={{ .Forgejo.Home }} HOME={{ .Forgejo.Home }}
RUN apk update && apk upgrade && apk --no-cache add \ RUN apk update && apk upgrade && apk --no-cache add \
asciidoctor \
bash \ bash \
ca-certificates \ ca-certificates \
gettext \ gettext \

View file

@ -12,9 +12,14 @@ LOCAL_COPY_PATH = {{ .Forgejo.Tmp }}/local-repo
[repository.upload] [repository.upload]
TEMP_PATH = {{ .Forgejo.Tmp }}/uploads TEMP_PATH = {{ .Forgejo.Tmp }}/uploads
[repository.pull-request]
DEFAULT_MERGE_STYLE = squash
[repository.signing] [repository.signing]
SIGNING_KEY = default
INITIAL_COMMIT = pubkey, twofa INITIAL_COMMIT = pubkey, twofa
MERGES = pubkey, twofa, basesigned, commitssigned MERGES = pubkey, twofa, basesigned, commitssigned
WIKI = never
[ui] [ui]
DEFAULT_THEME = forgejo-dark DEFAULT_THEME = forgejo-dark
@ -52,6 +57,7 @@ HOST = localhost:3306
NAME = gitea NAME = gitea
USER = gitea USER = gitea
PASSWD = PASSWD =
LOG_SQL = false
[indexer] [indexer]
ISSUE_INDEXER_PATH = {{ .Forgejo.DataContainerDirectory }}/indexers/issues.bleve ISSUE_INDEXER_PATH = {{ .Forgejo.DataContainerDirectory }}/indexers/issues.bleve
@ -112,3 +118,10 @@ JWT_SECRET = {{ .Forgejo.Oauth2JwtSecret }}
[federation] [federation]
ENABLED = true 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