Skip to content

Commit 2f5faaf

Browse files
Docker: update minimal image with purple-gowhatsapp to 1.20.0 (#513)
* update purple-gowhatsapp to 1.20.0 * Pin to Debian unstable snapshot for the spectrum packages * Skip apt update to avoid index refresh breaking version pinning 🤦‍♂ * Comment out the manual Telegram download as it's broken anyway.
1 parent f547a21 commit 2f5faaf

File tree

1 file changed

+20
-17
lines changed

1 file changed

+20
-17
lines changed

Dockerfile.trixie

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM debian:trixie-20240904 as base
1+
FROM debian:unstable-20250811 as base
22

33
ARG DEBIAN_FRONTEND=noninteractive
44
ARG APT_LISTCHANGES_FRONTEND=none
@@ -9,7 +9,7 @@ RUN apt-get install --no-install-recommends -y dpkg-dev devscripts curl git
99
#RUN echo "deb-src [signed-by=/etc/apt/trusted.gpg.d/spectrumim.gpg] https://packages.spectrum.im/spectrum2/ bullseye main" | tee -a /etc/apt/sources.list
1010
#RUN curl https://packages.spectrum.im/packages.key | gpg --dearmor -o /etc/apt/trusted.gpg.d/spectrumim.gpg
1111

12-
RUN apt-get update -qq
12+
# RUN apt-get update -qq
1313
RUN apt-get install --no-install-recommends -y libminiupnpc-dev libnatpmp-dev spectrum2 libpurple-dev cmake libssl-dev
1414
COPY . spectrum2/
1515

@@ -48,52 +48,55 @@ RUN echo "---> Install Teams" && \
4848
cd purple-teams && \
4949
make && \
5050
make DESTDIR=/tmp/out install
51+
5152
RUN echo "---> Install Skypeweb" && \
5253
git clone https://github.com/EionRobb/skype4pidgin.git && \
5354
cd skype4pidgin/skypeweb && \
5455
make && \
5556
make DESTDIR=/tmp/out install
5657

5758
RUN echo "---> purple-gowhatsapp" && \
58-
apt-get -y install golang && \
59-
git clone https://github.com/hoehermann/purple-gowhatsapp.git && \
60-
cd purple-gowhatsapp && \
61-
git checkout 723c329cfa54a7ce9a50c63c513c37759ffce82f && \
62-
git submodule update --init && \
63-
cmake . && \
64-
make && \
65-
make DESTDIR=/tmp/out install
59+
apt-get install -y golang-go && \
60+
git clone --recurse-submodules https://github.com/hoehermann/purple-gowhatsapp.git purple-whatsmeow && \
61+
cd purple-whatsmeow && \
62+
git checkout v1.20.0 && \
63+
cd .. && \
64+
cmake -S purple-whatsmeow -B build && \
65+
cmake --build build && \
66+
cmake --install build --strip --prefix /tmp/out
6667

6768
RUN echo "---> purple-battlenet" && \
68-
git clone --recursive https://github.com/EionRobb/purple-battlenet && \
69+
git clone --recursive https://github.com/EionRobb/purple-battlenet && \
6970
cd purple-battlenet && \
7071
make && \
7172
make DESTDIR=/tmp/out install
7273

7374
RUN echo "---> purple-hangouts" && \
74-
git clone --recursive https://github.com/EionRobb/purple-hangouts && \
75+
git clone --recursive https://github.com/EionRobb/purple-hangouts && \
7576
cd purple-hangouts && \
7677
make && \
7778
make DESTDIR=/tmp/out install
7879

7980
RUN echo "---> purple-mattermost" && \
80-
git clone --recursive https://github.com/EionRobb/purple-mattermost && \
81+
git clone --recursive https://github.com/EionRobb/purple-mattermost && \
8182
cd purple-mattermost && \
8283
make && \
8384
make DESTDIR=/tmp/out install
84-
RUN curl -o /tmp/out/libtelegram-tdlib.so https://buildbot.hehoe.de/tdlib-pruple/libtelegram-tdlib-1.8.35_bookworm_amd64.so
8585

86-
FROM debian:trixie-20240904 as production
86+
#RUN curl -o /tmp/out/libtelegram-tdlib.so https://buildbot.hehoe.de/tdlib-pruple/libtelegram-tdlib-1.8.35_bookworm_amd64.so
87+
88+
FROM debian:unstable-20250811 as production
8789

8890
EXPOSE 8080
8991
VOLUME ["/etc/spectrum2/transports", "/var/lib/spectrum2"]
9092

93+
94+
9195
RUN apt-get update -qq
9296
RUN apt-get install --no-install-recommends -y curl ca-certificates gnupg1 gpg gpg-agent
9397
RUN apt-get install --no-install-recommends -y spectrum2 spectrum2-backend-libpurple spectrum2-backend-libcommuni spectrum2-backend-swiften
9498
COPY --from=staging spectrum2/packaging/debian/*.deb /tmp/
9599

96-
97100
RUN echo "---> Installing libpurple plugins" && \
98101
DEBIAN_FRONTEND=noninteractive apt install --no-install-recommends -y \
99102
purple-discord \
@@ -106,4 +109,4 @@ COPY --from=staging spectrum2/packaging/docker/run.sh /run.sh
106109

107110
RUN rm -rf /tmp/*.deb
108111

109-
ENTRYPOINT ["/run.sh"]
112+
ENTRYPOINT ["/run.sh"]

0 commit comments

Comments
 (0)