Skip to content

Commit

Permalink
Update Dockerfile
Browse files Browse the repository at this point in the history
  • Loading branch information
jantomgid committed Jul 16, 2024
1 parent 7c6d0a3 commit 3fd01d4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
10 changes: 6 additions & 4 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,14 @@ RUN curl -sSL https://github.com/mikefarah/yq/releases/latest/download/yq_linux_

ARG EXECUTABLE=./mautrix-imessage
COPY $EXECUTABLE /usr/bin/mautrix-imessage
COPY ./example-config.yaml /opt/mautrix-imessage/example-config.yaml
COPY ./docker-run.sh /docker-run.sh
#COPY ./example-config.yaml /opt/mautrix-imessage/example-config.yaml
#COPY ./docker-run.sh /docker-run.sh

# Ensure the entrypoint script is executable
RUN chmod +x /docker-run.sh /usr/bin/mautrix-imessage
#RUN chmod +x /docker-run.sh /usr/bin/mautrix-imessage

VOLUME /data

CMD ["/docker-run.sh"]
#CMD ["/docker-run.sh"]
#CMD ["/usr/bin/mautrix-imessage -c /config/config.yaml -r /config/registration.yaml"]
ENTRYPOINT [ "/usr/bin/mautrix-imessage", "-c", "/config/config.yaml", "-r", "/config/registration.yaml" ]
1 change: 1 addition & 0 deletions build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ if [[ -f "$HEIF_PATH/libheif.1.dylib" ]]; then
fi

go build -o mautrix-imessage -tags "$build_tags" -ldflags "-X main.Tag=$(git describe --exact-match --tags 2>/dev/null) -X main.Commit=$(git rev-parse HEAD) -X 'main.BuildTime=`date '+%b %_d %Y, %H:%M:%S'`'" "$@"
echo $?
2 changes: 1 addition & 1 deletion custompuppet.go
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ func (user *User) StartCustomMXID(reloginOnFail bool) error {

func (user *User) tryAutomaticDoublePuppeting() {
user.zlog.Debug().Msg("Trying to automatically enable double puppet")
secret:= user.bridge.Config.GetDoublePuppetSecret(user.MXID)
secret := user.bridge.Config.GetDoublePuppetSecret(user.MXID)
user.zlog.Debug().Str("secret", secret).Msg("Got secret")
if !user.bridge.Config.CanAutoDoublePuppet(user.MXID) || user.DoublePuppetIntent != nil {
user.zlog.Debug().Msg("Automatic double puppeting not enabled")
Expand Down

0 comments on commit 3fd01d4

Please sign in to comment.