mirror of
https://github.com/mautrix/signal.git
synced 2025-03-14 14:15:36 +00:00
ci: remove v2 prefix
This commit is contained in:
parent
0c9f2c19d2
commit
ca53ff0e63
4 changed files with 9 additions and 10 deletions
|
@ -1,12 +1,11 @@
|
||||||
include:
|
include:
|
||||||
- project: 'mautrix/ci'
|
- project: 'mautrix/ci'
|
||||||
file: '/gov2.yml'
|
file: '/gov2-as-default.yml'
|
||||||
|
|
||||||
variables:
|
variables:
|
||||||
BUILDER_IMAGE: dock.mau.dev/tulir/gomuks-build-docker/signal
|
BUILDER_IMAGE: dock.mau.dev/tulir/gomuks-build-docker/signal
|
||||||
BINARY_NAME_V2: mautrix-signal
|
|
||||||
|
|
||||||
# 32-bit arm builds aren't supported
|
# 32-bit arm builds aren't supported
|
||||||
build arm v2:
|
build arm:
|
||||||
rules:
|
rules:
|
||||||
- when: never
|
- when: never
|
||||||
|
|
14
Dockerfile
14
Dockerfile
|
@ -11,7 +11,7 @@ ARG DBG=0
|
||||||
RUN ./build-rust.sh
|
RUN ./build-rust.sh
|
||||||
|
|
||||||
# -- Build mautrix-signal (with Go) --
|
# -- Build mautrix-signal (with Go) --
|
||||||
FROM golang:1-alpine3.19 AS go-builder
|
FROM golang:1-alpine3.20 AS go-builder
|
||||||
RUN apk add --no-cache git ca-certificates build-base olm-dev
|
RUN apk add --no-cache git ca-certificates build-base olm-dev
|
||||||
|
|
||||||
WORKDIR /build
|
WORKDIR /build
|
||||||
|
@ -20,9 +20,10 @@ COPY *.go go.* *.yaml *.sh ./
|
||||||
COPY pkg/signalmeow/. pkg/signalmeow/.
|
COPY pkg/signalmeow/. pkg/signalmeow/.
|
||||||
COPY pkg/libsignalgo/* pkg/libsignalgo/
|
COPY pkg/libsignalgo/* pkg/libsignalgo/
|
||||||
COPY pkg/libsignalgo/resources/. pkg/libsignalgo/resources/.
|
COPY pkg/libsignalgo/resources/. pkg/libsignalgo/resources/.
|
||||||
COPY config/. config/.
|
COPY pkg/msgconv/. pkg/msgconv/.
|
||||||
COPY database/. database/.
|
COPY pkg/signalid/. pkg/signalid/.
|
||||||
COPY msgconv/. msgconv/.
|
COPY pkg/connector/. pkg/connector/.
|
||||||
|
COPY cmd/. cmd/.
|
||||||
COPY .git .git
|
COPY .git .git
|
||||||
|
|
||||||
ARG DBG=0
|
ARG DBG=0
|
||||||
|
@ -38,15 +39,14 @@ EOF
|
||||||
RUN ./build-go.sh
|
RUN ./build-go.sh
|
||||||
|
|
||||||
# -- Run mautrix-signal --
|
# -- Run mautrix-signal --
|
||||||
FROM alpine:3.19
|
FROM alpine:3.20
|
||||||
|
|
||||||
ENV UID=1337 \
|
ENV UID=1337 \
|
||||||
GID=1337
|
GID=1337
|
||||||
|
|
||||||
RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq olm
|
RUN apk add --no-cache ffmpeg su-exec ca-certificates bash jq curl yq-go olm
|
||||||
|
|
||||||
COPY --from=go-builder /build/mautrix-signal /usr/bin/mautrix-signal
|
COPY --from=go-builder /build/mautrix-signal /usr/bin/mautrix-signal
|
||||||
COPY --from=go-builder /build/example-config.yaml /opt/mautrix-signal/example-config.yaml
|
|
||||||
COPY --from=go-builder /build/docker-run.sh /docker-run.sh
|
COPY --from=go-builder /build/docker-run.sh /docker-run.sh
|
||||||
COPY --from=go-builder /go/bin/dlv /usr/bin/dlv
|
COPY --from=go-builder /go/bin/dlv /usr/bin/dlv
|
||||||
VOLUME /data
|
VOLUME /data
|
||||||
|
|
Loading…
Add table
Reference in a new issue