increase gid and uid

Add discord plugin

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 2018-08-21 10:59:17 (needo37)
+- add discord plugin
+- run as bitlbee user
+
 ## 2018-08-17 17:59:13 (Waester)
 - add libsipe support
 

Dockerfile

@@ -2,7 +2,9 @@ FROM alpine:3.7
 
 ENV BITLBEE_VERSION 3.5.1
 
-RUN apk add --no-cache --update libpurple \
+RUN addgroup -g 101 -S bitlbee \
+ && adduser -u 101 -D -S -G bitlbee bitlbee \
+ && apk add --no-cache --update libpurple \
 	libpurple-xmpp \
 	libpurple-oscar \
 	libpurple-bonjour \
@@ -14,7 +16,7 @@ RUN apk add --no-cache --update libpurple \
 	libwebp \
 	glib \
 	protobuf-c \
-    && apk add --no-cache --update --virtual .build-dependencies \
+ && apk add --no-cache --update --virtual .build-dependencies \
 	git \
 	make \
 	autoconf \
@@ -31,66 +33,76 @@ RUN apk add --no-cache --update libpurple \
 	protobuf-c-dev \
 	mercurial \
 	libxml2-dev \
-    && cd /tmp \
-    && git clone 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 \
-    && cd /tmp \
-    && git clone https://github.com/jgeboski/bitlbee-facebook.git \
-    && cd bitlbee-facebook \
-    && ./autogen.sh \
-    && make \
-    && make install \
-    && strip /usr/lib/bitlbee/facebook.so \
-    && cd /tmp \
-    && git clone https://github.com/jgeboski/bitlbee-steam.git \
-    && cd bitlbee-steam \
-    && ./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 \
-    && git clone git://github.com/EionRobb/skype4pidgin.git \
-    && cd skype4pidgin/skypeweb \
-    && make \
-    && make install \
-    && strip /usr/lib/purple-2/libskypeweb.so \
-    && cd /tmp \
-    && git clone --recursive https://github.com/majn/telegram-purple \
-    && cd telegram-purple \
-    && ./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 \
-    && cd purple-hangouts \
-    && make \
-    && make install \
-    && strip /usr/lib/purple-2/libhangouts.so \
-    && cd /tmp \
-    && git clone https://github.com/dylex/slack-libpurple.git \
-    && cd slack-libpurple \
-    && make \
-    && make install \
-    && strip /usr/lib/purple-2/libslack.so \
-    && cd /tmp \
-    && git clone https://github.com/tieto/sipe.git \
-    && cd sipe \
-    && ./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 \
-    && rm -rf /tmp/* \
-    && rm -rf /usr/include/bitlbee \
-    && rm -f /usr/lib/pkgconfig/bitlbee.pc \
-    && apk del .build-dependencies
+ && cd /tmp \
+ && git clone 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 \
+ && cd /tmp \
+ && git clone https://github.com/jgeboski/bitlbee-facebook.git \
+ && cd bitlbee-facebook \
+ && ./autogen.sh \
+ && make \
+ && make install \
+ && strip /usr/lib/bitlbee/facebook.so \
+ && cd /tmp \
+ && git clone https://github.com/jgeboski/bitlbee-steam.git \
+ && cd bitlbee-steam \
+ && ./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 \
+ && git clone git://github.com/EionRobb/skype4pidgin.git \
+ && cd skype4pidgin/skypeweb \
+ && make \
+ && make install \
+ && strip /usr/lib/purple-2/libskypeweb.so \
+ && cd /tmp \
+ && git clone --recursive https://github.com/majn/telegram-purple \
+ && cd telegram-purple \
+ && ./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 \
+ && cd purple-hangouts \
+ && make \
+ && make install \
+ && strip /usr/lib/purple-2/libhangouts.so \
+ && cd /tmp \
+ && git clone https://github.com/dylex/slack-libpurple.git \
+ && cd slack-libpurple \
+ && make \
+ && make install \
+ && strip /usr/lib/purple-2/libslack.so \
+ && cd /tmp \
+ && git clone https://github.com/tieto/sipe.git \
+ && cd sipe \
+ && ./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 \
+ && cd /tmp \
+ && git clone https://github.com/sm00th/bitlbee-discord.git \
+ && cd bitlbee-discord \
+ && ./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 \    
+ && rm -rf /tmp/* \
+ && rm -rf /usr/include/bitlbee \
+ && rm -f /usr/lib/pkgconfig/bitlbee.pc \
+ && apk del .build-dependencies
 
 EXPOSE 6667
 
-ENTRYPOINT [ "/usr/sbin/bitlbee", "-F", "-n" ]
+USER bitlbee
+
+CMD [ "/usr/sbin/bitlbee", "-F", "-n" ]