Skip to content

Commit 950ea88

Browse files
committed
refactor: simplify Dockerfile ENV
1 parent 761e862 commit 950ea88

1 file changed

Lines changed: 24 additions & 15 deletions

File tree

Dockerfile

Lines changed: 24 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,7 @@ ARG BITLBEE_VERSION=3.6
1414
ARG FACEBOOK_VERSION=1.2.2
1515
ARG TARGETARCH
1616

17-
ENV DEBIAN_FRONTEND=noninteractive \
18-
LDFLAGS="-lgcrypt" \
19-
MAKEFLAGS="-j$(nproc)"
17+
ENV DEBIAN_FRONTEND=noninteractive
2018

2119
SHELL ["/bin/bash", "-o", "pipefail", "-c"]
2220
WORKDIR /build
@@ -56,31 +54,42 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
5654
# Build BitlBee
5755
RUN tar xf bitlbee.tar.gz
5856
WORKDIR /build/bitlbee-${BITLBEE_VERSION}
59-
RUN ./configure --jabber=1 --otr=1 --purple=1 --strip=1 --ssl=gnutls --systemdsystemunitdir=no && \
57+
RUN ./configure \
58+
--jabber=1 \
59+
--otr=1 \
60+
--purple=1 \
61+
--strip=1 \
62+
--ssl=gnutls \
63+
--systemdsystemunitdir=no && \
6064
make -j"$(nproc)" && \
6165
make install install-bin install-doc install-dev install-etc install-plugin-otr
6266

63-
WORKDIR /build/purple-discord
64-
RUN make && make install
67+
WORKDIR /build
68+
RUN tar xf facebook.tar.gz
69+
WORKDIR /build/bitlbee-facebook-${FACEBOOK_VERSION}
70+
RUN ./autogen.sh && \
71+
make -j"$(nproc)" && \
72+
make install
6573

74+
WORKDIR /build/purple-discord
75+
RUN make -j"$(nproc)" && make install
6676
WORKDIR /build/purple-matrix
67-
RUN make && make install
68-
77+
RUN make -j"$(nproc)" && make install
6978
WORKDIR /build/purple-teams
70-
RUN make && make install
79+
RUN make -j"$(nproc)" && make install
7180

7281
WORKDIR /build/slack-libpurple
7382
RUN make install
7483

75-
WORKDIR /build
76-
RUN tar xf facebook.tar.gz
77-
WORKDIR /build/bitlbee-facebook-${FACEBOOK_VERSION}
78-
RUN ./autogen.sh && make && make install
84+
WORKDIR /build/tdlib-purple
85+
RUN ./build_and_install.sh
7986

8087
WORKDIR /build/bitlbee-mastodon
81-
RUN ./autogen.sh && ./configure && make -j"$(nproc)" && make install
88+
RUN ./autogen.sh && \
89+
./configure && \
90+
make -j"$(nproc)" && \
91+
make install
8292

83-
WORKDIR /build
8493
RUN cmake -S purple-whatsmeow -B whatsapp-build -DCMAKE_BUILD_TYPE=Release && \
8594
cmake --build whatsapp-build && \
8695
cmake --install whatsapp-build --strip

0 commit comments

Comments
 (0)