Skip to content

Commit

Permalink
main: delete old bridge
Browse files Browse the repository at this point in the history
  • Loading branch information
tulir committed Aug 16, 2024
1 parent f3c0e5d commit d4712f5
Show file tree
Hide file tree
Showing 53 changed files with 112 additions and 10,792 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-meta
file: '/gov2-as-default.yml'
7 changes: 3 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
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-meta

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-meta /usr/bin/mautrix-meta
COPY --from=builder /build/example-config.yaml /opt/mautrix-meta/example-config.yaml
COPY --from=builder /build/docker-run.sh /docker-run.sh
VOLUME /data

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-meta
COPY $EXECUTABLE /usr/bin/mautrix-meta
COPY ./example-config.yaml /opt/mautrix-meta/example-config.yaml
COPY ./docker-run.sh /docker-run.sh
ENV BRIDGEV2=1
VOLUME /data
WORKDIR /data

CMD ["/docker-run.sh"]
15 changes: 0 additions & 15 deletions Dockerfile.v2.ci

This file was deleted.

Loading

0 comments on commit d4712f5

Please sign in to comment.