Skip to content

Commit 5491f14

Browse files
ryncsnimrasalghul
authored andcommitted
Minor fix & improvement for the Dockerfile (mastodon#14686)
* Dockerfile: Fix building with multiarch Tested on amd64 and arm64 * Reduce docker image size by clean up some unneeded source file
1 parent da259bf commit 5491f14

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

Dockerfile

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ RUN apt update && \
3636
./autogen.sh && \
3737
./configure --prefix=/opt/jemalloc && \
3838
make -j$(nproc) > /dev/null && \
39-
make install_bin install_include install_lib
39+
make install_bin install_include install_lib && \
40+
cd .. && rm -rf jemalloc-$JE_VER $JE_VER.tar.gz
4041

4142
# Install Ruby
4243
ENV RUBY_VER="2.6.6"
@@ -56,7 +57,8 @@ RUN apt update && \
5657
--disable-install-doc && \
5758
ln -s /opt/jemalloc/lib/* /usr/lib/ && \
5859
make -j$(nproc) > /dev/null && \
59-
make install
60+
make install && \
61+
cd .. && rm -rf ruby-$RUBY_VER.tar.gz ruby-$RUBY_VER
6062

6163
ENV PATH="${PATH}:/opt/ruby/bin:/opt/node/bin"
6264

@@ -107,11 +109,14 @@ RUN apt -y --no-install-recommends install \
107109
rm -rf /var/lib/apt/lists/*
108110

109111
# Add tini
110-
ENV TINI_VERSION="0.18.0"
111-
ENV TINI_SUM="12d20136605531b09a2c2dac02ccee85e1b874eb322ef6baf7561cd93f93c855"
112-
ADD https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini /tini
113-
RUN echo "$TINI_SUM tini" | sha256sum -c -
114-
RUN chmod +x /tini
112+
ENV TINI_VERSION="0.19.0"
113+
RUN dpkgArch="$(dpkg --print-architecture)" && \
114+
ARCH=$dpkgArch && \
115+
wget https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH \
116+
https://github.com/krallin/tini/releases/download/v${TINI_VERSION}/tini-$ARCH.sha256sum && \
117+
cat tini-$ARCH.sha256sum | sha256sum -c - && \
118+
mv tini-$ARCH /tini && rm tini-$ARCH.sha256sum && \
119+
chmod +x /tini
115120

116121
# Copy over mastodon source, and dependencies from building, and set permissions
117122
COPY --chown=mastodon:mastodon . /opt/mastodon

0 commit comments

Comments
 (0)