strip bitlbee and liboml

add matrix

CHANGELOG.md

@@ -1,13 +1,23 @@
 # Changelog
 
-## 2018-08-21 10:59:17 (needo37)
+## 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
+
+## 2018-09-10 08:52:53
+- add rocket.chat plugin
+- use alpine 3.8
+
+## 2018-08-21 10:59:17 ([needo37](https://github.com/needo37))
 - add discord plugin
 - run as bitlbee user
 
-## 2018-08-17 17:59:13 (Waester)
+## 2018-08-17 17:59:13 ([Waester](https://github.com/Waester))
 - add libsipe support
 
-## 2018-04-19 23:01:49 (friek)
+## 2018-04-19 23:01:49 ([friek](https://github.com/friek))
 - updated README
 - moved changelog to CHANGELOG.md
 
@@ -34,4 +44,3 @@
 
 ## 2017-03-30 11:43:46
 - trigger rebuild cause of facebook fix
-

Dockerfile

@@ -1,21 +1,51 @@
-FROM alpine:3.7
+FROM alpine:3.10
 
-ENV BITLBEE_VERSION 3.5.1
+ARG FACEBOOK=1
+ARG STEAM=1
+ARG SKYPEWEB=1
+ARG TELEGRAM=1
+ARG HANGOUTS=1
+ARG SLACK=1
+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
+ENV STEAM_VERSION a6444d2
+ENV SKYPEWEB_VERSION 5d29285
+ENV TELEGRAM_VERSION b101bbb
+ENV HANGOUTS_VERSION 3f7d89b
+ENV SLACK_VERSION 8acc4eb
+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 \
- && apk add --no-cache --update libpurple \
+ && apk add --no-cache --update tzdata \
+ 	libpurple \
 	libpurple-xmpp \
 	libpurple-oscar \
 	libpurple-bonjour \
 	json-glib \
 	libgcrypt \
-	libssl1.0 \
+	libssl1.1 \
-	libcrypto1.0 \
+	libcrypto1.1 \
 	gettext \
 	libwebp \
 	glib \
 	protobuf-c \
+	discount-libs \
+	libpng \
+	sqlite \
+	http-parser \
+	bash \
  && apk add --no-cache --update --virtual .build-dependencies \
 	git \
 	make \
@@ -33,6 +63,10 @@ RUN addgroup -g 101 -S bitlbee \
 	protobuf-c-dev \
 	mercurial \
 	libxml2-dev \
+	discount-dev \
+	libpng-dev \
+	sqlite-dev \
+	http-parser-dev \
  && cd /tmp \
  && git clone https://github.com/bitlbee/bitlbee.git \
  && cd bitlbee \
@@ -41,61 +75,98 @@ RUN addgroup -g 101 -S bitlbee \
  && make \
  && make install \
  && make install-dev \
- && cd /tmp \
+ && strip /usr/sbin/bitlbee \
- && git clone https://github.com/jgeboski/bitlbee-facebook.git \
+ && if [ ${FACEBOOK} -eq 1 ]; then cd /tmp \
+ && git clone https://github.com/bitlbee/bitlbee-facebook.git \
  && cd bitlbee-facebook \
+ && git checkout ${FACEBOOK_VERSION} \
  && ./autogen.sh \
  && make \
  && make install \
- && strip /usr/lib/bitlbee/facebook.so \
+ && strip /usr/lib/bitlbee/facebook.so; fi \
- && cd /tmp \
+ && if [ ${STEAM} -eq 1 ]; then cd /tmp \
- && git clone https://github.com/jgeboski/bitlbee-steam.git \
+ && git clone https://github.com/bitlbee/bitlbee-steam.git \
  && cd bitlbee-steam \
+ && git checkout ${STEAM_VERSION} \
  && ./autogen.sh --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl \
  && make \
  && make install \
- && strip /usr/lib/bitlbee/steam.so \
+ && strip /usr/lib/bitlbee/steam.so; fi \
- && cd /tmp \
+ && if [ ${SKYPEWEB} -eq 1 ]; then cd /tmp \
  && git clone git://github.com/EionRobb/skype4pidgin.git \
  && cd skype4pidgin/skypeweb \
+ && git checkout ${SKYPEWEB_VERSION} \
  && make \
  && make install \
- && strip /usr/lib/purple-2/libskypeweb.so \
+ && strip /usr/lib/purple-2/libskypeweb.so; fi \
- && cd /tmp \
+ && if [ ${TELEGRAM} -eq 1 ]; then cd /tmp \
  && git clone --recursive https://github.com/majn/telegram-purple \
  && cd telegram-purple \
+ && git checkout ${TELEGRAM_VERSION} \
  && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl \
  && make \
  && make install \
- && strip /usr/lib/purple-2/telegram-purple.so \
+ && strip /usr/lib/purple-2/telegram-purple.so; fi \
- && cd /tmp \
+ && if [ ${HANGOUTS} -eq 1 ]; then cd /tmp \
- && hg clone https://bitbucket.org/EionRobb/purple-hangouts \
+ && hg clone https://bitbucket.org/EionRobb/purple-hangouts -r ${HANGOUTS_VERSION} \
  && cd purple-hangouts \
  && make \
  && make install \
- && strip /usr/lib/purple-2/libhangouts.so \
+ && strip /usr/lib/purple-2/libhangouts.so; fi \
- && cd /tmp \
+ && if [ ${SLACK} -eq 1 ]; then cd /tmp \
  && git clone https://github.com/dylex/slack-libpurple.git \
  && cd slack-libpurple \
+ && git checkout ${SLACK_VERSION} \
  && make \
  && make install \
- && strip /usr/lib/purple-2/libslack.so \
+ && strip /usr/lib/purple-2/libslack.so; fi \
- && cd /tmp \
+ && if [ ${SIPE} -eq 1 ]; then cd /tmp \
  && git clone https://github.com/tieto/sipe.git \
  && cd sipe \
+ && git checkout ${SIPE_VERSION} \
  && ./autogen.sh \
  && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl --prefix=/usr \
  && make \
  && make install \
- && strip /usr/lib/purple-2/libsipe.so \
+ && strip /usr/lib/purple-2/libsipe.so; fi \
- && cd /tmp \
+ && if [ ${DISCORD} -eq 1 ]; then cd /tmp \
  && git clone https://github.com/sm00th/bitlbee-discord.git \
  && cd bitlbee-discord \
+ && git checkout ${DISCORD_VERSION} \
  && ./autogen.sh \
  && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl --prefix=/usr \
  && make \
  && make install \
- && strip /usr/lib/bitlbee/discord.so \    
+ && strip /usr/lib/bitlbee/discord.so; fi \
+ && if [ ${ROCKETCHAT} -eq 1 ]; then cd /tmp \
+ && hg clone https://bitbucket.org/EionRobb/purple-rocketchat -r ${ROCKETCHAT_VERSION} \
+ && cd purple-rocketchat \
+ && make \
+ && make install \
+ && strip /usr/lib/purple-2/librocketchat.so; fi \
+ && if [ ${MASTODON} -eq 1 ]; then cd /tmp \
+ && git clone -n https://github.com/kensanata/bitlbee-mastodon \
+ && cd bitlbee-mastodon \
+ && git checkout ${MASTODON_VERSION} \
+ && ./autogen.sh \
+ && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl \
+ && 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 \
+ && strip /usr/local/lib/libolm.so.${OLM_VERSION} \
+ && 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 \

README.md

@@ -1,10 +1,19 @@
 # docker-bitlbee-libpurple
 
-This docker image includes bitlbee with a bunch of useful plugins, the most
+This docker image includes bitlbee with a bunch of useful plugins:
-significant being the [libpurple Slack plugin](https://github.com/dylex/slack-libpurple).
+  - [facebook](https://github.com/jgeboski/bitlbee-facebook)
+  - [steam](https://github.com/jgeboski/bitlbee-steam)
+  - [skypeweb](https://github.com/EionRobb/skype4pidgin)
+  - [telegram](https://github.com/majn/telegram-purple)
+  - [hangouts](https://bitbucket.org/EionRobb/purple-hangouts)
+  - [slack](https://github.com/dylex/slack-libpurple)
+  - [sipe](https://github.com/tieto/sipe)
+  - [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)
 
-As Slack is turning off its IRC gateway on May 15 2018, now is the time to
+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.
-spin up your own docker image and start using bitlbee instead.
 
 ## Building and running the image
 Build the image and tag it: