diff options
| author | ezkrg <ezkrg@ezkrg.me> | 2019-11-25 17:19:03 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-25 17:19:03 +0000 |
| commit | 9f05eee5f3837104bd0a6142c36a411ef8f8f527 (patch) | |
| tree | aa3bc7cc90aac693b970f055ae834750ad073a70 | |
| parent | strip mastodon (diff) | |
| parent | add matrix (diff) | |
| download | docker-bitlbee-libpurple-9f05eee5f3837104bd0a6142c36a411ef8f8f527.tar.gz docker-bitlbee-libpurple-9f05eee5f3837104bd0a6142c36a411ef8f8f527.zip | |
Merge pull request #14 from ezkrg/matrix
add matrix
| -rw-r--r-- | CHANGELOG.md | 3 | ||||
| -rw-r--r-- | Dockerfile | 20 | ||||
| -rw-r--r-- | README.md | 1 |
3 files changed, 24 insertions, 0 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 788984c..d3cb928 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 2019-11-25 18:13:41 ([revmischa](https://github.com/revmischa)) +- add matrix + ## 2019-11-25 13:39:21 ([revmischa](https://github.com/revmischa)) - add mastodon @@ -10,6 +10,7 @@ ARG SIPE=1 ARG DISCORD=1 ARG ROCKETCHAT=1 ARG MASTODON=1 +ARG MATRIX=1 ENV BITLBEE_VERSION 3.6 ENV FACEBOOK_VERSION v1.2.0 @@ -22,6 +23,8 @@ ENV SIPE_VERSION upstream/1.23.3 ENV DISCORD_VERSION aa0bbf2 ENV ROCKETCHAT_VERSION 826990b ENV MASTODON_VERSION 83dee0b +ENV OLM_VERSION 3.1.4 +ENV MATRIX_VERSION 4494ba2 RUN addgroup -g 101 -S bitlbee \ && adduser -u 101 -D -S -G bitlbee bitlbee \ @@ -40,6 +43,8 @@ RUN addgroup -g 101 -S bitlbee \ protobuf-c \ discount-libs \ libpng \ + sqlite \ + http-parser \ bash \ && apk add --no-cache --update --virtual .build-dependencies \ git \ @@ -60,6 +65,8 @@ RUN addgroup -g 101 -S bitlbee \ libxml2-dev \ discount-dev \ libpng-dev \ + sqlite-dev \ + http-parser-dev \ && cd /tmp \ && git clone https://github.com/bitlbee/bitlbee.git \ && cd bitlbee \ @@ -145,6 +152,19 @@ RUN addgroup -g 101 -S bitlbee \ && make \ && make install \ && strip /usr/lib/bitlbee/mastodon.so; fi \ + && if [ ${MATRIX} -eq 1 ]; then cd /tmp \ + && git clone -n https://gitlab.matrix.org/matrix-org/olm.git \ + && cd olm \ + && git checkout ${OLM_VERSION} \ + && make \ + && make install \ + && cd /tmp \ + && git clone -n https://github.com/matrix-org/purple-matrix \ + && cd purple-matrix \ + && git checkout ${MATRIX_VERSION} \ + && make \ + && make install \ + && strip /usr/lib/purple-2/libmatrix.so; fi \ && rm -rf /tmp/* \ && rm -rf /usr/include/bitlbee \ && rm -f /usr/lib/pkgconfig/bitlbee.pc \ @@ -11,6 +11,7 @@ This docker image includes bitlbee with a bunch of useful plugins: - [discord](https://github.com/sm00th/bitlbee-discord) - [rocket.chat](https://bitbucket.org/EionRobb/purple-rocketchat) - [mastodon](https://github.com/kensanata/bitlbee-mastodon) + - [matrix](https://github.com/matrix-org/purple-matrix) The most significant being the [libpurple Slack plugin](https://github.com/dylex/slack-libpurple). As Slack is turning off its IRC gateway on May 15 2018, now is the time to spin up your own docker image and start using bitlbee instead. |