update changelog

upgrade matrix version
upgrade mastodon version
2020-04-07 15:33:31 +02:00 · 2020-04-06 10:19:31 +02:00 · 2020-04-06 10:16:46 +02:00 · 2020-04-06 07:54:04 +02:00 · 2020-04-06 07:38:52 +02:00 · 2020-04-05 14:01:58 +02:00
3 changed files with 267 additions and 95 deletions
--- a/.drone.yml
+++ b/.drone.yml
@@ -0,0 +1,37 @@
+---
+kind: pipeline
+type: docker
+name: default
+
+steps:
+  - name: test
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DHU
+      password:
+        from_secret: DHP
+      repo: ezkrg/bitlbee-libpurple
+      tags: test
+      when:
+        branch:
+          - master
+  - name: release
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DHU
+      password:
+        from_secret: DHP
+      repo: ezkrg/bitlbee-libpurple
+      tags:
+        - ${DRONE_TAG}
+        - latest
+      when:
+        event:
+          - tag
+---
+kind: signature
+hmac: fe1d9f29429b7c966b53377ced1af268d08ddd754b535fe41a930b2a5ee44744
+
+...
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Changelog

+## 2020-04-06 10:19:50
+- upgrade discord version from aa0bbf2 to 0.4.3
+- upgrade mastodon version from 83dee0b to v1.4.4
+- upgrade matrix version from 4494ba2 to 1d23385
+
+## 2020-04-05 14:01:52
+- upgrade telegram version from b101bbb to 1.4.3
+- upgrade slack version from 8acc4eb to e6e5427
+- upgrade sipe version from upstream/1.23.3 to 1.25.0
+- change sipe clone url
+
 ## 2019-11-25 18:13:41 ([revmischa](https://github.com/revmischa))
 - add matrix

--- a/314
+++ b/314
@@ -1,159 +1,285 @@
 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
+ARG BITLBEE_VERSION=3.6

 RUN addgroup -g 101 -S bitlbee \
 && adduser -u 101 -D -S -G bitlbee bitlbee \
- && apk add --no-cache --update tzdata \
- 	libpurple \
+ && apk add --no-cache --update \
+ 	tzdata \
+	bash \
+	glib \
+	libssl1.1 \
+	libpurple \
 	libpurple-xmpp \
 	libpurple-oscar \
 	libpurple-bonjour \
-	json-glib \
-	libgcrypt \
-	libssl1.1 \
-	libcrypto1.1 \
-	gettext \
-	libwebp \
-	glib \
-	protobuf-c \
-	discount-libs \
-	libpng \
-	sqlite \
-	http-parser \
-	bash \
 && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
 	git \
-	make \
-	autoconf \
-	automake \
-	libtool \
-	gcc \
-	g++ \
-	json-glib-dev \
-	libgcrypt-dev \
-	openssl-dev \
-	pidgin-dev \
-	libwebp-dev \
 	glib-dev \
-	protobuf-c-dev \
-	mercurial \
-	libxml2-dev \
-	discount-dev \
-	libpng-dev \
-	sqlite-dev \
-	http-parser-dev \
+	openssl-dev \
+	python2 \
+	pidgin-dev \
 && cd /tmp \
- && git clone https://github.com/bitlbee/bitlbee.git \
+ && git clone -n https://github.com/bitlbee/bitlbee.git \
 && cd bitlbee \
 && git checkout ${BITLBEE_VERSION} \
 && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl --purple=1 --ssl=openssl --prefix=/usr --etcdir=/etc/bitlbee \
 && make \
 && make install \
 && make install-dev \
+ && make install-etc \
 && strip /usr/sbin/bitlbee \
- && if [ ${FACEBOOK} -eq 1 ]; then cd /tmp \
- && git clone https://github.com/bitlbee/bitlbee-facebook.git \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies
+
+ARG FACEBOOK=1
+ARG FACEBOOK_VERSION=v1.2.0
+
+RUN if [ ${FACEBOOK} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	json-glib \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	autoconf \
+	automake \
+	libtool \
+	glib-dev \
+	json-glib-dev \
+ && git clone -n https://github.com/bitlbee/bitlbee-facebook.git \
 && cd bitlbee-facebook \
 && git checkout ${FACEBOOK_VERSION} \
- && ./autogen.sh \
+ && ./autogen.sh --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl \
 && make \
 && make install \
- && strip /usr/lib/bitlbee/facebook.so; fi \
- && if [ ${STEAM} -eq 1 ]; then cd /tmp \
- && git clone https://github.com/bitlbee/bitlbee-steam.git \
+ && strip /usr/lib/bitlbee/facebook.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG STEAM=1
+ARG STEAM_VERSION=a6444d2
+
+RUN if [ ${STEAM} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	libgcrypt \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	autoconf \
+	automake \
+	libtool \
+	libgcrypt-dev \
+	glib-dev \
+ && git clone -n 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; fi \
- && if [ ${SKYPEWEB} -eq 1 ]; then cd /tmp \
- && git clone git://github.com/EionRobb/skype4pidgin.git \
- && cd skype4pidgin/skypeweb \
+ && strip /usr/lib/bitlbee/steam.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG SKYPEWEB=1
+ARG SKYPEWEB_VERSION=5d29285
+
+RUN if [ ${SKYPEWEB} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	json-glib \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	pidgin-dev \
+	json-glib-dev \
+ && git clone -n https://github.com/EionRobb/skype4pidgin.git \
+ && cd skype4pidgin \
 && git checkout ${SKYPEWEB_VERSION} \
+ && cd skypeweb \
 && make \
 && make install \
- && strip /usr/lib/purple-2/libskypeweb.so; fi \
- && if [ ${TELEGRAM} -eq 1 ]; then cd /tmp \
- && git clone --recursive https://github.com/majn/telegram-purple \
+ && strip /usr/lib/purple-2/libskypeweb.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG TELEGRAM=1
+ARG TELEGRAM_VERSION=v1.4.3
+
+RUN if [ ${TELEGRAM} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	libgcrypt \
+	zlib \
+	libwebp \
+	libpng \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	libgcrypt-dev \
+	zlib-dev \
+	pidgin-dev \
+	libwebp-dev \
+	libpng-dev \
+ && git clone -n https://github.com/majn/telegram-purple \
 && cd telegram-purple \
 && git checkout ${TELEGRAM_VERSION} \
+ && git submodule update --init --recursive \
 && ./configure --build=x86_64-alpine-linux-musl --host=x86_64-alpine-linux-musl \
 && make \
 && make install \
- && strip /usr/lib/purple-2/telegram-purple.so; fi \
- && if [ ${HANGOUTS} -eq 1 ]; then cd /tmp \
+ && strip /usr/lib/purple-2/telegram-purple.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG HANGOUTS=1
+ARG HANGOUTS_VERSION=3f7d89b
+
+RUN if [ ${HANGOUTS} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	protobuf-c \
+	json-glib \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	mercurial \
+	pidgin-dev \
+	protobuf-c-dev \
+	json-glib-dev \
 && hg clone https://bitbucket.org/EionRobb/purple-hangouts -r ${HANGOUTS_VERSION} \
 && cd purple-hangouts \
 && make \
 && make install \
- && strip /usr/lib/purple-2/libhangouts.so; fi \
- && if [ ${SLACK} -eq 1 ]; then cd /tmp \
- && git clone https://github.com/dylex/slack-libpurple.git \
+ && strip /usr/lib/purple-2/libhangouts.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG SLACK=1
+ARG SLACK_VERSION=e6e5427
+
+RUN if [ ${SLACK} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	pidgin-dev \
+	glib-dev \
+ && git clone -n https://github.com/dylex/slack-libpurple.git \
 && cd slack-libpurple \
 && git checkout ${SLACK_VERSION} \
 && make \
 && make install \
- && 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 \
+ && strip /usr/lib/purple-2/libslack.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG SIPE=1
+ARG SIPE_VERSION=1.25.0
+
+RUN if [ ${SIPE} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	libtool \
+	glib-dev \
+	intltool \
+	automake \
+	autoconf \
+	openssl-dev \
+	libxml2-dev \
+	pidgin-dev \
+	flex \
+ && git clone -n https://repo.or.cz/siplcs.git \
+ && cd siplcs \
 && 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; fi \
- && if [ ${DISCORD} -eq 1 ]; then cd /tmp \
- && git clone https://github.com/sm00th/bitlbee-discord.git \
+ && strip /usr/lib/purple-2/libsipe.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG DISCORD=1
+ARG DISCORD_VERSION=0.4.3
+
+RUN if [ ${DISCORD} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	autoconf \
+	automake \
+	libtool \
+	glib-dev \
+ && git clone -n 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; fi \
- && if [ ${ROCKETCHAT} -eq 1 ]; then cd /tmp \
+ && strip /usr/lib/bitlbee/discord.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG ROCKETCHAT=1
+ARG ROCKETCHAT_VERSION=826990b
+
+RUN if [ ${ROCKETCHAT} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	discount \
+	json-glib \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	mercurial \
+	pidgin-dev \
+	json-glib-dev \
+	discount-dev \
 && 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 \
+ && strip /usr/lib/purple-2/librocketchat.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG MASTODON=1
+ARG MASTODON_VERSION=v1.4.4
+
+RUN if [ ${MASTODON} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	autoconf \
+	automake \
+	libtool \
+	glib-dev \
 && git clone -n https://github.com/kensanata/bitlbee-mastodon \
 && cd bitlbee-mastodon \
 && git checkout ${MASTODON_VERSION} \
- && ./autogen.sh \
+ && sh ./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 \
+ && strip /usr/lib/bitlbee/mastodon.so \
+ && rm -rf /tmp/* \
+ && apk del .build-dependencies; fi
+
+ARG MATRIX=1
+ARG OLM_VERSION=3.1.4
+ARG MATRIX_VERSION=1d23385
+
+RUN if [ ${MATRIX} -eq 1 ]; then cd /tmp \
+ && apk add --no-cache --update \
+	sqlite \
+	http-parser \
+	libgcrypt \
+	json-glib \
+ && apk add --no-cache --update --virtual .build-dependencies \
+	build-base \
+	git \
+	libgcrypt-dev \
+	pidgin-dev \
+	json-glib-dev \
+	glib-dev \
+	sqlite-dev \
+	http-parser-dev \
 && git clone -n https://gitlab.matrix.org/matrix-org/olm.git \
 && cd olm \
 && git checkout ${OLM_VERSION} \
@@ -166,11 +292,9 @@ RUN addgroup -g 101 -S bitlbee \
 && git checkout ${MATRIX_VERSION} \
 && make \
 && make install \
- && strip /usr/lib/purple-2/libmatrix.so; fi \
+ && strip /usr/lib/purple-2/libmatrix.so \
 && rm -rf /tmp/* \
- && rm -rf /usr/include/bitlbee \
- && rm -f /usr/lib/pkgconfig/bitlbee.pc \
- && apk del .build-dependencies
+ && apk del .build-dependencies; fi

 EXPOSE 6667
Author	SHA1	Message	Date
ezkrg	de3d1ebc7c	update changelog	2020-04-07 15:33:31 +02:00
ezkrg	f7d5ec7109	upgrade matrix version	2020-04-06 10:19:31 +02:00
ezkrg	58d60ca91e	upgrade mastodon version	2020-04-06 10:16:46 +02:00
ezkrg	9ac2d40fbb	upgrade discord version	2020-04-06 07:54:04 +02:00
ezkrg	76ccab317c	update changelog	2020-04-06 07:38:52 +02:00
ezkrg	4adc3ae460	add flex	2020-04-05 14:01:58 +02:00
ezkrg	5e208e231e	fix clone dir name	2020-04-05 13:21:43 +02:00
ezkrg	931afdc586	upgrade sipe version and change clone url	2020-04-05 13:03:34 +02:00
ezkrg	2a98d409b1	upgrade slack version	2020-04-05 11:53:22 +02:00
ezkrg	9ca7f4958d	upgrade telegram version	2020-04-05 10:58:00 +02:00
ezkrg	04c678870f	sign drone config	2020-01-13 12:53:28 +01:00
ezkrg	4befd197a9	add dron config	2020-01-13 12:48:08 +01:00
ezkrg	a236c2eb8f	Merge pull request #15 from ezkrg/multirun multi RUN	2019-11-26 20:55:37 +01:00
ezkrg	e815a2439f	spaces or tabs ?!?!	2019-11-26 20:30:40 +01:00
ezkrg	88a558de05	multiple run in Dockerfile	2019-11-26 20:24:58 +01:00