aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorterminaldweller <devi@terminaldweller.com>2024-05-21 04:34:07 +0000
committerterminaldweller <devi@terminaldweller.com>2024-05-21 04:34:07 +0000
commit2935f850a7a1c804bf99e93c550d28ec3786f0fb (patch)
treea926960043c131d1c989c4116334dbbebeae92e8
parentupdate (diff)
downloaddocker-bitlbee-libpurple-2935f850a7a1c804bf99e93c550d28ec3786f0fb.tar.gz
docker-bitlbee-libpurple-2935f850a7a1c804bf99e93c550d28ec3786f0fb.zip
updatenew
-rw-r--r--Dockerfile.debian92
1 files changed, 45 insertions, 47 deletions
diff --git a/Dockerfile.debian b/Dockerfile.debian
index 799c4c9..74e0bfe 100644
--- a/Dockerfile.debian
+++ b/Dockerfile.debian
@@ -3,10 +3,6 @@ FROM debian:bullseye-slim as base-image
FROM base-image as bitlbee-build
ARG BITLBEE_VERSION=3.6-1
-ENV ALL_PROXY=socks5h://192.168.1.214:9995
-
-RUN echo Acquire::http::Proxy "socks5h://192.168.1.214:9995"; >> /etc/apt/apt.conf.d/proxy.conf
-RUN echo Acquire::https::Proxy "socks5h://192.168.1.214:9995"; >> /etc/apt/apt.conf.d/proxy.conf
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
@@ -43,7 +39,7 @@ RUN echo OTR=${OTR} > /tmp/status \
FROM bitlbee-build as facebook-build
-ARG FACEBOOK=1
+ARG FACEBOOK=0
ARG FACEBOOK_VERSION
RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
@@ -65,7 +61,7 @@ RUN echo FACEBOOK=${FACEBOOK} > /tmp/status \
FROM bitlbee-build as steam-build
-ARG STEAM=1
+ARG STEAM=0
ARG STEAM_VERSION
RUN echo STEAM=${STEAM} > /tmp/status \
@@ -109,7 +105,7 @@ RUN echo SKYPEWEB=${SKYPEWEB} > /tmp/status \
FROM bitlbee-build as telegram-build
ARG TELEGRAM=1
-ARG TELEGRAM_VERSION
+ARG TELEGRAM_VERSION=v0.8.1
RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
&& if [ ${TELEGRAM} -eq 1 ]; \
@@ -147,7 +143,7 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
FROM bitlbee-build as hangouts-build
-ARG HANGOUTS=1
+ARG HANGOUTS=0
ARG HANGOUTS_VERSION
RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
@@ -193,7 +189,7 @@ RUN echo SLACK=${SLACK} > /tmp/status \
FROM bitlbee-build as sipe-build
-ARG SIPE=1
+ARG SIPE=0
ARG SIPE_VERSION
RUN echo SIPE=${SIPE} > /tmp/status \
@@ -243,7 +239,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
FROM bitlbee-build as rocketchat-build
-ARG ROCKETCHAT=1
+ARG ROCKETCHAT=0
ARG ROCKETCHAT_VERSION
RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
@@ -289,7 +285,7 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
FROM bitlbee-build as matrix-build
-ARG MATRIX=1
+ARG MATRIX=0
ARG MATRIX_VERSION
SHELL [ "/bin/bash", "-c" ]
@@ -316,7 +312,7 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
FROM bitlbee-build as signald-build
-ARG SIGNAL=1
+ARG SIGNAL=0
ARG SIGNAL_VERSION=master
RUN echo SIGNAL=${SIGNAL} > /tmp/status \
@@ -343,7 +339,7 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
FROM bitlbee-build as icyque-build
-ARG ICYQUE=1
+ARG ICYQUE=0
ARG ICYQUE_VERSION
RUN echo ICYQUE=${ICYQUE} > /tmp/status \
@@ -364,21 +360,25 @@ RUN echo ICYQUE=${ICYQUE} > /tmp/status \
FROM bitlbee-build as whatsapp-build
ARG WHATSAPP=1
-ARG WHATSAPP_VERSION
+ARG WHATSAPP_VERSION=v1.12.0
-ENV ALL_PROXY=socks5h://192.168.1.214:9990
-RUN echo 'Acquire::http::Proxy "socks5h://192.168.1.214:9995";' > /etc/apt/apt.conf.d/proxy.conf && \
- echo 'Acquire::https::Proxy "socks5h://192.168.1.214:9995";' >> /etc/apt/apt.conf.d/proxy.conf
RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \
&& if [ ${WHATSAPP} -eq 1 ]; \
then cd /tmp \
+ && apt-get install -y wget \
+ && wget https://go.dev/dl/go1.21.10.linux-amd64.tar.gz \
+ && tar -C /usr/local -xzf go1.21.10.linux-amd64.tar.gz \
&& echo "deb http://deb.debian.org/debian bullseye-backports main" | tee -a /etc/apt/sources.list \
&& apt-get update \
- && apt-get install -y --no-install-recommends -t bullseye-backports golang-go \
- && apt-get install -y --no-install-recommends cmake pkg-config \
+ # && apt-get install -y -t bullseye-backports golang-1.19 \
+ && apt-get install -y -t bullseye-backports \
+ && apt-get install -y --no-install-recommends cmake pkg-config libgdk-pixbuf2.0-dev libopusfile-dev \
&& git clone -n https://github.com/hoehermann/purple-gowhatsapp.git \
&& cd purple-gowhatsapp \
- && git checkout whatsmeow \
+ && git checkout ${WHATSAPP_VERSION} \
+ # && export PATH=$PATH:/usr/lib/go-1.19/bin \
+ && export PATH=$PATH:/usr/local/go/bin \
+ && git submodule update --init \
&& mkdir build \
&& cd build \
&& cmake .. \
@@ -393,12 +393,9 @@ RUN echo WHATSAPP=${WHATSAPP} > /tmp/status \
FROM bitlbee-build as lurch-build
-ARG LURCH=1
+ARG LURCH=0
ARG LURCH_VERSION=master
-ENV ALL_PROXY=socks5h://192.168.1.214:9990
-RUN echo 'Acquire::http::Proxy "socks5h://192.168.1.214:9995";' > /etc/apt/apt.conf.d/proxy.conf && \
- echo 'Acquire::https::Proxy "socks5h://192.168.1.214:9995";' >> /etc/apt/apt.conf.d/proxy.conf
RUN echo LURCH=${LURCH} > /tmp/status \
&& if [ ${LURCH} -eq 1 ]; \
then cd /tmp \
@@ -429,13 +426,13 @@ COPY --from=bitlbee-build /etc/bitlbee /tmp/etc/bitlbee
COPY --from=otr-install /usr/lib/bitlbee/otr.so /tmp/usr/lib/bitlbee/otr.so
COPY --from=otr-install /tmp/status /tmp/plugin/otr
-COPY --from=facebook-build /usr/lib/bitlbee/facebook.so /tmp/usr/lib/bitlbee/facebook.so
-COPY --from=facebook-build /usr/lib/bitlbee/facebook.la /tmp/usr/lib/bitlbee/facebook.la
-COPY --from=facebook-build /tmp/status /tmp/plugin/facebook
+# COPY --from=facebook-build /usr/lib/bitlbee/facebook.so /tmp/usr/lib/bitlbee/facebook.so
+# COPY --from=facebook-build /usr/lib/bitlbee/facebook.la /tmp/usr/lib/bitlbee/facebook.la
+# COPY --from=facebook-build /tmp/status /tmp/plugin/facebook
-COPY --from=steam-build /usr/lib/bitlbee/steam.so /tmp/usr/lib/bitlbee/steam.so
-COPY --from=steam-build /usr/lib/bitlbee/steam.la /tmp/usr/lib/bitlbee/steam.la
-COPY --from=steam-build /tmp/status /tmp/plugin/steam
+# COPY --from=steam-build /usr/lib/bitlbee/steam.so /tmp/usr/lib/bitlbee/steam.so
+# COPY --from=steam-build /usr/lib/bitlbee/steam.la /tmp/usr/lib/bitlbee/steam.la
+# COPY --from=steam-build /tmp/status /tmp/plugin/steam
COPY --from=skypeweb-build /usr/lib/purple-2/libskypeweb.so /tmp/usr/lib/purple-2/libskypeweb.so
COPY --from=skypeweb-build /tmp/status /tmp/plugin/skypeweb
@@ -445,44 +442,44 @@ COPY --from=telegram-build /usr/local/share/metainfo/tdlib-purple.metainfo.xml /
COPY --from=telegram-build /usr/local/share/locale /tmp/usr/local/share/locale
COPY --from=telegram-build /tmp/status /tmp/plugin/telegram
-COPY --from=hangouts-build /usr/lib/purple-2/libhangouts.so /tmp/usr/lib/purple-2/libhangouts.so
-COPY --from=hangouts-build /tmp/status /tmp/plugin/hangouts
+# COPY --from=hangouts-build /usr/lib/purple-2/libhangouts.so /tmp/usr/lib/purple-2/libhangouts.so
+# COPY --from=hangouts-build /tmp/status /tmp/plugin/hangouts
COPY --from=slack-build /usr/lib/purple-2/libslack.so /tmp/usr/lib/purple-2/libslack.so
COPY --from=slack-build /tmp/status /tmp/plugin/slack
-COPY --from=sipe-build /usr/lib/purple-2/libsipe.so /tmp/usr/lib/purple-2/libsipe.so
-COPY --from=sipe-build /usr/lib/purple-2/libsipe.la /tmp/usr/lib/purple-2/libsipe.la
-COPY --from=sipe-build /usr/share/locale /tmp/usr/share/locale
-COPY --from=sipe-build /tmp/status /tmp/plugin/sipe
+# COPY --from=sipe-build /usr/lib/purple-2/libsipe.so /tmp/usr/lib/purple-2/libsipe.so
+# COPY --from=sipe-build /usr/lib/purple-2/libsipe.la /tmp/usr/lib/purple-2/libsipe.la
+# COPY --from=sipe-build /usr/share/locale /tmp/usr/share/locale
+# COPY --from=sipe-build /tmp/status /tmp/plugin/sipe
COPY --from=discord-build /usr/lib/bitlbee/discord.so /tmp/usr/lib/bitlbee/discord.so
COPY --from=discord-build /usr/lib/bitlbee/discord.la /tmp/usr/lib/bitlbee/discord.la
COPY --from=discord-build /usr/share/bitlbee/discord-help.txt /tmp/usr/share/bitlbee/discord-help.txt
COPY --from=discord-build /tmp/status /tmp/plugin/discord
-COPY --from=rocketchat-build /usr/lib/purple-2/librocketchat.so /tmp/usr/lib/purple-2/librocketchat.so
-COPY --from=rocketchat-build /tmp/status /tmp/plugin/rocketchat
+# COPY --from=rocketchat-build /usr/lib/purple-2/librocketchat.so /tmp/usr/lib/purple-2/librocketchat.so
+# COPY --from=rocketchat-build /tmp/status /tmp/plugin/rocketchat
COPY --from=mastodon-build /usr/lib/bitlbee/mastodon.so /tmp/usr/lib/bitlbee/mastodon.so
COPY --from=mastodon-build /usr/lib/bitlbee/mastodon.la /tmp/usr/lib/bitlbee/mastodon.la
COPY --from=mastodon-build /usr/share/bitlbee/mastodon-help.txt /tmp/usr/share/bitlbee/mastodon-help.txt
COPY --from=mastodon-build /tmp/status /tmp/plugin/mastodon
-COPY --from=matrix-build /usr/lib/purple-2/libmatrix.so /tmp/usr/lib/purple-2/libmatrix.so
-COPY --from=matrix-build /tmp/status /tmp/plugin/matrix
+# COPY --from=matrix-build /usr/lib/purple-2/libmatrix.so /tmp/usr/lib/purple-2/libmatrix.so
+# COPY --from=matrix-build /tmp/status /tmp/plugin/matrix
-COPY --from=signald-build /usr/lib/purple-2/libsignald.so /tmp/usr/lib/purple-2/libsignald.so
-COPY --from=signald-build /tmp/status /tmp/plugin/signald
+# COPY --from=signald-build /usr/lib/purple-2/libsignald.so /tmp/usr/lib/purple-2/libsignald.so
+# COPY --from=signald-build /tmp/status /tmp/plugin/signald
-COPY --from=icyque-build /usr/lib/purple-2/libicyque.so /tmp/usr/lib/purple-2/libicyque.so
-COPY --from=icyque-build /tmp/status /tmp/plugin/icyque
+# COPY --from=icyque-build /usr/lib/purple-2/libicyque.so /tmp/usr/lib/purple-2/libicyque.so
+# COPY --from=icyque-build /tmp/status /tmp/plugin/icyque
COPY --from=whatsapp-build /usr/lib/purple-2/libwhatsmeow.so /tmp/usr/lib/purple-2/libwhatsmeow.so
COPY --from=whatsapp-build /tmp/status /tmp/plugin/whatsapp
-COPY --from=lurch-build /usr/lib/purple-2/lurch.so /tmp/usr/lib/purple-2/lurch.so
-COPY --from=lurch-build /tmp/status /tmp/plugin/lurch
+# COPY --from=lurch-build /usr/lib/purple-2/lurch.so /tmp/usr/lib/purple-2/lurch.so
+# COPY --from=lurch-build /tmp/status /tmp/plugin/lurch
RUN apt-get update \
&& apt-get install -y --no-install-recommends findutils \
@@ -515,16 +512,17 @@ RUN groupadd -g 101 -r bitlbee \
&& if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib1g libwebp6 libpng16-16 libstdc++6"; fi \
&& if [ ${HANGOUTS} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libprotobuf-c1"; fi \
&& if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libmagic1"; fi \
+ && if [ ${WHATSAPP} -eq 1 ]; then PKGS="${PKGS} libopusfile-dev libgdk-pixbuf2.0-dev"; fi \
&& if [ ${SIPE} -eq 1 ]; then PKGS="${PKGS} libxml2"; fi \
&& if [ ${ROCKETCHAT} -eq 1 ]; then PKGS="${PKGS} libmarkdown2"; fi \
&& if [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} libsqlite3-0 libhttp-parser2.9 libolm2"; fi \
&& if [ ${LURCH} -eq 1 ]; then PKGS="${PKGS} libxml2 libmxml1 libsqlite3-0 libgcrypt20"; fi \
+ && PKGS="${PKGS} vim" \
&& apt-get update \
&& apt-get install -y --no-install-recommends ${PKGS} \
&& apt-get clean \
&& rm /plugins
-ENV ALL_PROXY=
EXPOSE 6667
# CMD [ "/usr/sbin/bitlbee", "-F", "-n", "-u", "bitlbee" ]