revert arm build cause fail on armv7

Build for ARM platforms

.drone.yml

@@ -22,7 +22,7 @@ steps:
     - sleep 5
     - docker buildx create --use --name docker --node docker --platform linux/amd64 --driver docker-container $DOCKER_HOST
     - echo $PASSWORD | docker login --username $USER --password-stdin
-    - docker buildx build --load --cache-from ezkrg/cache:bitlbee-libpurple --cache-to ezkrg/cache:bitlbee-libpurple -t ezkrg/bitlbee-libpurple:test .
+    - docker buildx build --load --cache-from ezkrg/cache:bitlbee-libpurple --cache-to ezkrg/cache:bitlbee-libpurple -t ezkrg/bitlbee-libpurple:test --platform linux/amd64 .
     - docker push ezkrg/bitlbee-libpurple:test
 
   - name: release
@@ -44,7 +44,7 @@ steps:
       - tag
 
 ---
-kind: pipeline 
+kind: pipeline
 type: docker
 name: notification
 
@@ -71,6 +71,6 @@ depends_on:
 
 ---
 kind: signature
-hmac: 6d34136b0fc3ae4a1c12e759c5eb553b3be864760bf1efd26c3b2b00b711229a
+hmac: 9c778c50b9cb687fe3e1614048c082db18c4fe6f531aba5c04f0ec950a2814d1
 
 ...

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## 2021-09-14 22:52:43 ([markrawls](https://github.com/markrawls))
+- build for ARM platforms
+
+## 2021-07-13 23:38:45 ([mooomooo](https://github.com/mooomooo))
+- add flag and deps to enable attachment handling for Signal plugin
+
+## 2021-06-11 19:23:13
+- update hangouts
+- update slack
+- update rocket.chat
+- update olm and matrix
+- update signal
+
+## 2021-05-14 17:05:39
+- add icyque
+
 ## 2021-05-06 15:21:19
 - update facebook version to 1.2.2
 - update skypeweb to c4906b8

Dockerfile

@@ -129,7 +129,7 @@ RUN echo TELEGRAM=${TELEGRAM} > /tmp/status \
 FROM bitlbee-build as hangouts-build
 
 ARG HANGOUTS=1
-ARG HANGOUTS_VERSION=efa7a53
+ARG HANGOUTS_VERSION=e8c8088
 
 RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
  && if [ ${HANGOUTS} -eq 1 ]; \
@@ -149,7 +149,7 @@ RUN echo HANGOUTS=${HANGOUTS} > /tmp/status \
 FROM bitlbee-build as slack-build
 
 ARG SLACK=1
-ARG SLACK_VERSION=2e9fa02
+ARG SLACK_VERSION=e0c73ae
 
 SHELL [ "/bin/bash", "-c" ]
 
@@ -220,7 +220,7 @@ RUN echo DISCORD=${DISCORD} > /tmp/status \
 FROM bitlbee-build as rocketchat-build
 
 ARG ROCKETCHAT=1
-ARG ROCKETCHAT_VERSION=5da3e14
+ARG ROCKETCHAT_VERSION=62090bc
 
 RUN echo ROCKETCHAT=${ROCKETCHAT} > /tmp/status \
  && if [ ${ROCKETCHAT} -eq 1 ]; \
@@ -264,8 +264,8 @@ RUN echo MASTODON=${MASTODON} > /tmp/status \
 FROM bitlbee-build as matrix-build
 
 ARG MATRIX=1
-ARG OLM_VERSION=3.1.4
+ARG OLM_VERSION=3.2.4
-ARG MATRIX_VERSION=1d23385
+ARG MATRIX_VERSION=88f9558
 
 RUN echo MATRIX=${MATRIX} > /tmp/status \
  && if [ ${MATRIX} -eq 1 ]; \
@@ -284,7 +284,7 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
        && make install \
        && strip /usr/lib/purple-2/libmatrix.so; \
      else mkdir -p /usr/lib/purple-2 \
-       && ln -sf /nowhere /usr/local/lib/libolm.so.3.1.4 \
+       && ln -sf /nowhere /usr/local/lib/libolm.so \
        && ln -sf /nowhere /usr/lib/purple-2/libmatrix.so; \
     fi
 
@@ -293,15 +293,18 @@ RUN echo MATRIX=${MATRIX} > /tmp/status \
 FROM bitlbee-build as signald-build
 
 ARG SIGNAL=1
-ARG SIGNAL_VERSION=f53a118
+ARG SIGNAL_VERSION=v0.8.1
 
 RUN echo SIGNAL=${SIGNAL} > /tmp/status \
  && if [ ${SIGNAL} -eq 1 ]; \
      then cd /tmp \
+       && apk --no-cache add file-dev libmagic \
        && git clone -n https://github.com/hoehermann/libpurple-signald \
        && cd libpurple-signald \
        && git checkout ${SIGNAL_VERSION} \
-       && make \
+       && git submodule init \
+       && git submodule update \
+       && make SUPPORT_EXTERNAL_ATTACHMENTS=1 \
        && make install \
        && strip /usr/lib/purple-2/libsignald.so; \
      else mkdir -p /usr/lib/purple-2 \
@@ -310,6 +313,26 @@ RUN echo SIGNAL=${SIGNAL} > /tmp/status \
 
 # ---
 
+FROM bitlbee-build as icyque-build
+
+ARG ICYQUE=1
+ARG ICYQUE_VERSION=4fc08a0
+
+RUN echo ICYQUE=${ICYQUE} > /tmp/status \
+ && if [ ${ICYQUE} -eq 1 ]; \
+     then cd /tmp \
+       && git clone -n https://github.com/EionRobb/icyque.git \
+       && cd icyque \
+       && git checkout ${ICYQUE_VERSION} \
+       && make \
+       && make install \
+       && strip /usr/lib/purple-2/libicyque.so; \
+     else mkdir -p /usr/lib/purple-2 \
+       && ln -sf /nowhere /usr/lib/purple-2/libicyque.so; \
+    fi
+
+# ---
+
 FROM alpine:${ALPINE_VERSION} as bitlbee-plugins
 
 COPY --from=bitlbee-build /usr/sbin/bitlbee /tmp/usr/sbin/bitlbee
@@ -362,13 +385,16 @@ COPY --from=mastodon-build /usr/lib/bitlbee/mastodon.la /tmp/usr/lib/bitlbee/mas
 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/local/lib/libolm.so.3.1.4 /tmp/usr/local/lib/libolm.so.3
+COPY --from=matrix-build /usr/local/lib/libolm.so /tmp/usr/local/lib/libolm.so.3
 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=icyque-build /usr/lib/purple-2/libicyque.so /tmp/usr/lib/purple-2/libicyque.so
+COPY --from=icyque-build /tmp/status /tmp/plugin/icyque
+
 RUN apk add --update --no-cache findutils \
  && find /tmp/ -type f -empty -delete \
  && find /tmp/ -type d -empty -delete \
@@ -390,10 +416,12 @@ RUN addgroup -g 101 -S bitlbee \
  && source /plugins \
  && if [ ${OTR} -eq 1 ]; then PKGS="${PKGS} libotr"; fi \
  && if [ ${FACEBOOK} -eq 1 ] || [ ${SKYPEWEB} -eq 1 ] || [ ${HANGOUTS} -eq 1 ] \
- || [ ${ROCKETCHAT} -eq 1 ] || [ ${MATRIX} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} json-glib"; fi \
+ || [ ${ROCKETCHAT} -eq 1 ] || [ ${MATRIX} -eq 1 ] || [ ${SIGNAL} -eq 1 ] \
+ || [ ${ICYQUE} -eq 1 ]; then PKGS="${PKGS} json-glib"; fi \
  && if [ ${STEAM} -eq 1 ] || [ ${TELEGRAM} -eq 1 ] || [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} libgcrypt"; fi \
  && if [ ${TELEGRAM} -eq 1 ]; then PKGS="${PKGS} zlib libwebp libpng"; fi \
  && if [ ${HANGOUTS} -eq 1 ] || [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} protobuf-c"; fi \
+ && if [ ${SIGNAL} -eq 1 ]; then PKGS="${PKGS} libmagic"; fi \
  && if [ ${SIPE} -eq 1 ]; then PKGS="${PKGS} libxml2"; fi \
  && if [ ${ROCKETCHAT} -eq 1 ]; then PKGS="${PKGS} discount"; fi \
  && if [ ${MATRIX} -eq 1 ]; then PKGS="${PKGS} sqlite http-parser"; fi \

README.md

@@ -13,6 +13,7 @@ This docker image includes bitlbee with a bunch of useful plugins:
   - [mastodon](https://github.com/kensanata/bitlbee-mastodon)
   - [matrix](https://github.com/matrix-org/purple-matrix)
   - [signal](https://github.com/hoehermann/libpurple-signald)
+  - [icyque](https://github.com/EionRobb/icyque)
 
 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.