push to 0.6.0
This commit is contained in:
parent
b4a41352e1
commit
55b4463d78
@ -1,6 +1,6 @@
|
|||||||
FROM docker.io/golang:1.19.3-alpine3.17 as builder
|
FROM docker.io/golang:1.20-alpine3.18 as builder
|
||||||
|
|
||||||
ENV VERSION=v0.2.0
|
ENV VERSION=v0.6.0
|
||||||
|
|
||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
git \
|
git \
|
||||||
@ -18,7 +18,7 @@ RUN git checkout $VERSION
|
|||||||
|
|
||||||
RUN go build -o /build/bin/mautrix-discord
|
RUN go build -o /build/bin/mautrix-discord
|
||||||
|
|
||||||
FROM docker.io/thallian/confd-env:3.17-3.1.3.0
|
FROM docker.io/thallian/confd-env:3.18-3.1.5.0
|
||||||
|
|
||||||
RUN addgroup -g 2222 matrix-bridge
|
RUN addgroup -g 2222 matrix-bridge
|
||||||
RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge
|
RUN adduser -h /var/lib/matrix-bridge -u 2222 -D -G matrix-bridge matrix-bridge
|
||||||
@ -28,7 +28,7 @@ COPY --from=builder /build/bin/mautrix-discord /bin/mautrix-discord
|
|||||||
RUN apk --no-cache add \
|
RUN apk --no-cache add \
|
||||||
ca-certificates \
|
ca-certificates \
|
||||||
libstdc++ \
|
libstdc++ \
|
||||||
olm
|
olm
|
||||||
|
|
||||||
WORKDIR /var/lib/matrix-bridge
|
WORKDIR /var/lib/matrix-bridge
|
||||||
|
|
||||||
|
@ -83,7 +83,7 @@ bridge:
|
|||||||
# .Discriminator - The 4 numbers after the name on Discord
|
# .Discriminator - The 4 numbers after the name on Discord
|
||||||
# .Bot - Whether the user is a bot
|
# .Bot - Whether the user is a bot
|
||||||
# .System - Whether the user is an official system user
|
# .System - Whether the user is an official system user
|
||||||
displayname_template: '{{"{{"}}.Username{{"}}"}}#{{"{{"}}.Discriminator{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}'
|
displayname_template: '{{"{{"}}or .GlobalName .Username{{"}}"}}{{"{{"}}if .Bot{{"}}"}} (bot){{"{{"}}end{{"}}"}}'
|
||||||
# Displayname template for Discord channels (bridged as rooms, or spaces when type=4).
|
# Displayname template for Discord channels (bridged as rooms, or spaces when type=4).
|
||||||
# Available variables:
|
# Available variables:
|
||||||
# .Name - Channel name, or user displayname (pre-formatted with displayname_template) in DMs.
|
# .Name - Channel name, or user displayname (pre-formatted with displayname_template) in DMs.
|
||||||
|
Loading…
Reference in New Issue
Block a user