increase gid and uid

use single run to decrease layers
add needo37's work to changelog
2018-08-21 11:14:43 +02:00 · 2018-08-21 11:07:26 +02:00 · 2018-08-21 11:07:00 +02:00 · 2018-08-21 10:57:45 +02:00 · 2018-08-21 00:31:42 -05:00 · 2018-08-20 23:28:31 -05:00
2 changed files with 78 additions and 62 deletions
--- a/CHANGELOG.md
+++ b/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

--- a/16
+++ b/16
@@ -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 \
@@ -86,6 +88,14 @@ RUN apk add --no-cache --update libpurple \
 && 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 \
@@ -93,4 +103,6 @@ RUN apk add --no-cache --update libpurple \

 EXPOSE 6667

-ENTRYPOINT [ "/usr/sbin/bitlbee", "-F", "-n" ]
+USER bitlbee
+
+CMD [ "/usr/sbin/bitlbee", "-F", "-n" ]
Author	SHA1	Message	Date
ezkrg	043bd98700	increase gid and uid	2018-08-21 11:14:43 +02:00
ezkrg	0bc1103787	use single run to decrease layers	2018-08-21 11:07:26 +02:00
ezkrg	9cde1af86e	add needo37's work to changelog	2018-08-21 11:07:00 +02:00
ezkrg	bdf63fa9ec	Merge pull request #3 from needo37/master Add discord plugin	2018-08-21 10:57:45 +02:00
needo37	7841a2eb47	Running things as root is bad.	2018-08-21 00:31:42 -05:00
needo37	38af27f938	Update Dockerfile	2018-08-20 23:28:31 -05:00