Skip to content

Commit

Permalink
Working
Browse files Browse the repository at this point in the history
  • Loading branch information
mbologna committed Nov 27, 2024
1 parent acceb21 commit aa12c02
Showing 1 changed file with 36 additions and 18 deletions.
54 changes: 36 additions & 18 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM docker.io/buildpack-deps:bookworm-scm AS builder
FROM docker.io/buildpack-deps:stable-scm AS builder

LABEL org.opencontainers.image.title="BitlBee Docker container" \
LABEL org.opencontainers.image.title="BitlBee container" \
org.opencontainers.image.description="A containerized version of BitlBee with additional plugins." \
org.opencontainers.image.url="https://github.com/mbologna/docker-bitlbee" \
org.opencontainers.image.licenses="MIT"
Expand All @@ -9,7 +9,7 @@ ENV BITLBEE_VERSION "3.6"
ENV SKYPE4PIDGIN_VERSION "1.7"
ENV FACEBOOK_VERSION "1.2.2"

RUN apt-get update && apt-get install -y --no-install-recommends \
RUN apt update && apt dist-upgrade -y && apt install -y --no-install-recommends \

Check failure on line 12 in Dockerfile

View workflow job for this annotation

GitHub Actions / build

DL3027 warning: Do not use apt as it is meant to be a end-user tool, use apt-get or apt-cache instead
autoconf automake build-essential cmake g++ gettext gcc git \
gperf imagemagick libtool make libglib2.0-dev libhttp-parser-dev \
libotr5-dev libpurple-dev libgnutls28-dev libjson-glib-dev libnss3-dev \
Expand Down Expand Up @@ -52,21 +52,39 @@ RUN cd "tdlib-purple" && ./build_and_install.sh

RUN libtool --finish /usr/local/lib/bitlbee

FROM debian:stable

COPY --from=builder /usr/local/etc/bitlbee/ /usr/local/etc/bitlbee/
COPY --from=builder /usr/local/lib/bitlbee/ /usr/local/lib/bitlbee/
COPY --from=builder /usr/local/lib/pkgconfig/ /usr/local/lib/pkgconfig/
#COPY --from=builder /usr/local/lib/purple-2/ /usr/local/lib/purple-2/
COPY --from=builder /usr/local/sbin/bitlbee /usr/local/sbin/bitlbee
COPY --from=builder /usr/local/share/bitlbee/ /usr/local/share/bitlbee/
COPY --from=builder /usr/local/share/locale/ /usr/local/share/locale/
COPY --from=builder /usr/local/share/man/ /usr/local/share/man/
COPY --from=builder /usr/local/share/metainfo/ /usr/local/share/metainfo/

RUN apt update && apt install --no-install-recommends -y \
libpurple0 \
libotr5
RUN rm -fr purple-* && \
rm -fr slack-libpurple && \
rm -fr skype4pidgin-* && \
rm -fr bitlbee-facebook* && \
rm -fr bitlbee-mastodon* && \
rm -fr tdlib-purple && \
rm -fr *.gz && \
apt clean && \
rm -fr /var/lib/apt/lists/* /tmp/* /var/tmp/*

# FROM docker.io/debian:stable-slim

# COPY --from=builder /usr/local/etc/bitlbee/ /usr/local/etc/bitlbee/
# COPY --from=builder /usr/local/lib/bitlbee/ /usr/local/lib/bitlbee/
# COPY --from=builder /usr/local/lib/pkgconfig/ /usr/local/lib/pkgconfig/
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libdiscord.so /usr/lib/x86_64-linux-gnu/purple-2/libdiscord.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so /usr/lib/x86_64-linux-gnu/purple-2/libhangouts.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so /usr/lib/x86_64-linux-gnu/purple-2/libmatrix.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so /usr/lib/x86_64-linux-gnu/purple-2/libskypeweb.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libslack.so /usr/lib/x86_64-linux-gnu/purple-2/libslack.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libteams-personal.so /usr/lib/x86_64-linux-gnu/purple-2/libteams-personal.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libteams.so /usr/lib/x86_64-linux-gnu/purple-2/libteams.so
# COPY --from=builder /usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so /usr/lib/x86_64-linux-gnu/purple-2/libtelegram-tdlib.so
# COPY --from=builder /usr/local/sbin/bitlbee /usr/local/sbin/bitlbee
# COPY --from=builder /usr/local/share/bitlbee/ /usr/local/share/bitlbee/
# COPY --from=builder /usr/local/share/locale/ /usr/local/share/locale/
# COPY --from=builder /usr/local/share/man/ /usr/local/share/man/
# COPY --from=builder /usr/local/share/metainfo/ /usr/local/share/metainfo/

# RUN apt update && apt install --no-install-recommends -y \
# libpurple0 \
# libotr5

RUN adduser --system --home /var/lib/bitlbee --disabled-password \
--disabled-login --shell /usr/sbin/nologin bitlbee
RUN touch /var/run/bitlbee.pid && chown bitlbee:nogroup /var/run/bitlbee.pid
Expand Down

0 comments on commit aa12c02

Please sign in to comment.