From 9b6801398b16de79cf21e9fb1e23018aac5e4ccf Mon Sep 17 00:00:00 2001 From: zhaoYangguang <1163765691@qq.com> Date: Wed, 27 Oct 2021 17:18:35 +0800 Subject: [PATCH] Update Dockerfile --- Dockerfile | 10 ++++------ README.md | 2 +- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 19a1a06..23985d8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,19 +1,17 @@ -FROM golang:1-alpine AS builder +FROM golang:1-alpine3.14 AS builder -RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories -RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev@edge_community +RUN apk add --no-cache git ca-certificates build-base su-exec olm-dev COPY . /build WORKDIR /build RUN go build -o /usr/bin/matrix-skype -FROM alpine:latest +FROM alpine:3.14 ENV UID=1337 \ GID=1337 -RUN echo "@edge_community http://dl-cdn.alpinelinux.org/alpine/edge/community" >> /etc/apk/repositories -RUN apk add --no-cache su-exec ca-certificates olm@edge_community +RUN apk add --no-cache ffmpeg su-exec ca-certificates olm bash jq yq curl COPY --from=builder /usr/bin/matrix-skype /usr/bin/matrix-skype COPY --from=builder /build/example-config.yaml /opt/matrix-skype/example-config.yaml diff --git a/README.md b/README.md index 5c48bcb..c5f58aa 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ matrix-skype is a library for bridging matrix and skype, about matrix, please re The skype api lib of matrix-skype is [go-skypeapi](https://github.com/kelaresg/go-skypeapi). [matrix room(#goskypebridge:matrix.org)](https://app.element.io/#/room/#goskypebridge:matrix.org) -This matrix-skype bridge is based on [mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp),so the installation and usage methods are very similar to mautrix-whatsapp(matrix-skype currently does not support docker installation) +This matrix-skype bridge is based on [mautrix-whatsapp](https://github.com/tulir/mautrix-whatsapp),so the installation and usage methods are very similar to mautrix-whatsapp > # mautrix-whatsapp > A Matrix-WhatsApp puppeting bridge based on the [Rhymen/go-whatsapp](https://github.com/Rhymen/go-whatsapp)