strip bitlbee and liboml

Merge pull request #14 from ezkrg/matrix
add matrix
2019-11-25 23:59:01 +01:00 · 2019-11-25 18:19:03 +01:00 · 2019-11-25 18:14:25 +01:00 · 2019-11-25 18:11:04 +01:00 · 2019-11-25 14:10:23 +01:00 · 2019-11-25 14:03:20 +01:00
3 changed files with 89 additions and 26 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,17 +1,23 @@
 # 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
+
 ## 2018-09-10 08:52:53
 - add rocket.chat plugin
 - use alpine 3.8

-## 2018-08-21 10:59:17 (needo37)
+## 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

@@ -37,5 +43,4 @@
 - trigger rebuild cause of facebook fix

 ## 2017-03-30 11:43:46
- trigger rebuild cause of facebook fix
-
+- trigger rebuild cause of facebook fix
--- a/98
+++ b/98
@@ -1,8 +1,30 @@
 FROM alpine:3.10

+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 \
@@ -21,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 \
@@ -41,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 \
@@ -49,46 +75,52 @@ RUN addgroup -g 101 -S bitlbee \
 && make \
 && make install \
 && make install-dev \
- && cd /tmp \
- && git clone https://github.com/jgeboski/bitlbee-facebook.git \
+ && strip /usr/sbin/bitlbee \
+ && 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 \
- && cd /tmp \
- && git clone https://github.com/jgeboski/bitlbee-steam.git \
+ && strip /usr/lib/bitlbee/facebook.so; fi \
+ && if [ ${STEAM} -eq 1 ]; then cd /tmp \
+ && 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 \
- && cd /tmp \
+ && strip /usr/lib/bitlbee/steam.so; fi \
+ && 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 \
- && cd /tmp \
+ && strip /usr/lib/purple-2/libskypeweb.so; fi \
+ && 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 \
- && cd /tmp \
- && hg clone https://bitbucket.org/EionRobb/purple-hangouts \
+ && strip /usr/lib/purple-2/telegram-purple.so; fi \
+ && if [ ${HANGOUTS} -eq 1 ]; then cd /tmp \
+ && hg clone https://bitbucket.org/EionRobb/purple-hangouts -r ${HANGOUTS_VERSION} \
 && cd purple-hangouts \
 && make \
 && make install \
- && strip /usr/lib/purple-2/libhangouts.so \
- && cd /tmp \
+ && strip /usr/lib/purple-2/libhangouts.so; fi \
+ && 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 \
- && cd /tmp \
+ && strip /usr/lib/purple-2/libslack.so; fi \
+ && if [ ${SIPE} -eq 1 ]; then cd /tmp \
 && git clone https://github.com/tieto/sipe.git \
 && cd sipe \
 && git checkout ${SIPE_VERSION} \
@@ -96,21 +128,45 @@ RUN addgroup -g 101 -S bitlbee \
 && ./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 \
- && cd /tmp \
+ && strip /usr/lib/purple-2/libsipe.so; fi \
+ && 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 \
- && cd /tmp \
+ && 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 \
+ && 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 \
--- a/README.md
+++ b/README.md
@@ -10,6 +10,8 @@ This docker image includes bitlbee with a bunch of useful plugins:
  - [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)

 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.
Author	SHA1	Message	Date
ezkrg	0023581ccb	strip bitlbee and liboml	2019-11-25 23:59:01 +01:00
ezkrg	9f05eee5f3	Merge pull request #14 from ezkrg/matrix add matrix	2019-11-25 18:19:03 +01:00
ezkrg	646575547f	add matrix	2019-11-25 18:14:25 +01:00
ezkrg	a49641cdd4	add matrix	2019-11-25 18:11:04 +01:00
ezkrg	00593243c1	strip mastodon	2019-11-25 14:10:23 +01:00
ezkrg	2a9d8f86a1	contributor names as links	2019-11-25 14:03:20 +01:00
ezkrg	655e5731ac	Merge pull request #13 from ezkrg/mastodon add mastodon	2019-11-25 13:47:09 +01:00
ezkrg	c7b6fcce50	add mastodon to readme too	2019-11-25 13:44:40 +01:00
ezkrg	f36e7a705d	add mastodon	2019-11-25 13:41:05 +01:00
ezkrg	de67477be5	enable or disable plugins with build args	2019-08-28 13:28:30 +02:00
ezkrg	f0e3afa97f	add missing versions	2019-07-24 14:52:04 +02:00