Skip to content

Commit 5809399

Browse files
committed
fix: add missing files from built plugins
1 parent 3a503f7 commit 5809399

1 file changed

Lines changed: 20 additions & 7 deletions

File tree

Dockerfile

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,34 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
112112
apt-get install -y --no-install-recommends \
113113
libpurple0 libotr5 libssl3 libgnutls30 libgcrypt20 \
114114
libglib2.0-0 libjson-glib-1.0-0 libprotobuf-c1 \
115-
libhttp-parser2.9 libsqlite3-0 ca-certificates \
115+
libhttp-parser2.9 libsqlite3-0 libopusfile0 \
116+
libwebp7 libolm3 libqrencode4 \
117+
libstdc++6 zlib1g ca-certificates \
116118
netcat-openbsd tini && \
117119
apt-get clean && \
118120
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
119121

120122
# Copy binaries and libraries from builder
121-
COPY --from=builder /usr/local /usr/local
122-
COPY --from=builder /usr/lib/*-linux-gnu/purple-2 /usr/lib/purple-2-temp/
123+
COPY --from=builder /usr/local/lib /usr/local/lib
124+
COPY --from=builder /usr/local/sbin /usr/local/sbin
125+
COPY --from=builder /usr/local/bin /usr/local/bin
126+
COPY --from=builder /usr/local/share /usr/local/share
127+
COPY --from=builder /usr/local/etc /usr/local/etc
128+
129+
# Copy purple plugins and their dependencies
130+
COPY --from=builder /usr/lib/*-linux-gnu/purple-2 /tmp/purple-2/
131+
COPY --from=builder /usr/share/pixmaps/pidgin /usr/share/pixmaps/pidgin/
123132

124133
# Install purple plugins to correct architecture directory
125-
RUN ARCH_DIR=$(find /usr/lib -maxdepth 1 -name "*-linux-gnu" | head -n1) && \
134+
RUN ARCH_DIR=$(ls -d /usr/lib/*-linux-gnu 2>/dev/null | head -n1) && \
126135
mkdir -p "${ARCH_DIR}/purple-2" && \
127-
cp -r /usr/lib/purple-2-temp/* "${ARCH_DIR}/purple-2/" && \
128-
rm -rf /usr/lib/purple-2-temp && \
129-
ldconfig
136+
if [ -d /tmp/purple-2 ]; then \
137+
cp -a /tmp/purple-2/* "${ARCH_DIR}/purple-2/" && \
138+
rm -rf /tmp/purple-2; \
139+
fi && \
140+
ldconfig && \
141+
# Verify plugins were copied
142+
ls -la "${ARCH_DIR}/purple-2/" || echo "Warning: No plugins found"
130143

131144
# Create bitlbee user and directories with proper permissions
132145
RUN groupadd -r -g 1000 bitlbee && \

0 commit comments

Comments
 (0)