Skip to content

Commit

Permalink
all: delete legacy bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
tulir committed Aug 15, 2024
1 parent 9f26ee1 commit 83bd0b1
Show file tree
Hide file tree
Showing 44 changed files with 18 additions and 8,199 deletions.
7 changes: 1 addition & 6 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
include:
#- project: 'mautrix/ci'
# file: '/go.yml'
- project: 'mautrix/ci'
file: '/gov2.yml'

variables:
BINARY_NAME_V2: mautrix-gmessages
file: '/gov2-as-default.yml'
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM golang:1-alpine3.19 AS builder
FROM golang:1-alpine3.20 AS builder

RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev

COPY . /build
WORKDIR /build
RUN go build -o /usr/bin/mautrix-gmessages

FROM alpine:3.19
FROM alpine:3.20

ENV UID=1337 \
GID=1337

RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq curl
RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq-go curl

COPY --from=builder /usr/bin/mautrix-gmessages /usr/bin/mautrix-gmessages
COPY --from=builder /build/docker-run.sh /docker-run.sh
Expand Down
7 changes: 4 additions & 3 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
FROM alpine:3.19
FROM alpine:3.20

ENV UID=1337 \
GID=1337

RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq
RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq-go

ARG EXECUTABLE=./mautrix-gmessages
COPY $EXECUTABLE /usr/bin/mautrix-gmessages
COPY ./example-config.yaml /opt/mautrix-gmessages/example-config.yaml
COPY ./docker-run.sh /docker-run.sh
ENV BRIDGEV2=1
VOLUME /data
WORKDIR /data

CMD ["/docker-run.sh"]
13 changes: 0 additions & 13 deletions Dockerfile.dev

This file was deleted.

15 changes: 0 additions & 15 deletions Dockerfile.v2.ci

This file was deleted.

2 changes: 1 addition & 1 deletion ROADMAP.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
* [x] Automatic portal creation
* [x] After login
* [x] When receiving message
* [ ] Private chat creation by inviting Matrix ghost of remote user to new room
* [x] Private chat creation by inviting Matrix ghost of remote user to new room
96 changes: 0 additions & 96 deletions analytics.go

This file was deleted.

Loading

0 comments on commit 83bd0b1

Please sign in to comment.