Skip to content

Commit 971d0be

Browse files
authored
bc hack
1 parent ee72f66 commit 971d0be

File tree

1 file changed

+26
-23
lines changed

1 file changed

+26
-23
lines changed

Dockerfile

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -83,29 +83,32 @@ ARG \
8383
GO_ARM64=linux-arm64.tar.gz \
8484
GO_ARM64_SHA256="b00b694903d126c588c378e72d3545549935d3982635ba3f7a964c9fa23fe3b9"
8585

86-
RUN apt-get update && apt-get install -y --no-install-recommends \
87-
aggregate="${AGGREGATE_VERSION}" \
88-
bc="${BC_VERSION}" \
89-
bind9-dnsutils="${BIND9_VERSION}" \
90-
fzf="${FZF_VERSION}" \
91-
gh="${GH_VERSION}" \
92-
git="${GIT_VERSION}" \
93-
gnupg2="${GNUPG2_VERSION}" \
94-
iproute2="${IPROUTE2_VERSION}" \
95-
ipset="${IPSET_VERSION}" \
96-
iptables="${IPTABLES_VERSION}" \
97-
jq="${JQ_VERSION}" \
98-
less="${LESS_VERSION}" \
99-
make="${MAKE_VERSION}" \
100-
man-db="${MAN_DB_VERSION}" \
101-
psmisc="${PSMISC_VERSION}" \
102-
procps="${PROCPS_VERSION}" \
103-
ripgrep="${RIPGREP_VERSION}" \
104-
sudo="${SUDO_VERSION}" \
105-
tree="${TREE_VERSION}" \
106-
unzip="${UNZIP_VERSION}" \
107-
vim="${VIM_VERSION}" \
108-
&& apt-get clean && rm -rf /var/lib/apt/lists/*
86+
RUN BC_VERSION="${BC_VERSION}$([ "${TARGETARCH}" = "arm64" ] && echo "+b1" || echo "")" \
87+
apt-get update && \
88+
apt-get install -y --no-install-recommends \
89+
aggregate="${AGGREGATE_VERSION}" \
90+
bc="${BC_VERSION}" \
91+
bind9-dnsutils="${BIND9_VERSION}" \
92+
fzf="${FZF_VERSION}" \
93+
gh="${GH_VERSION}" \
94+
git="${GIT_VERSION}" \
95+
gnupg2="${GNUPG2_VERSION}" \
96+
iproute2="${IPROUTE2_VERSION}" \
97+
ipset="${IPSET_VERSION}" \
98+
iptables="${IPTABLES_VERSION}" \
99+
jq="${JQ_VERSION}" \
100+
less="${LESS_VERSION}" \
101+
make="${MAKE_VERSION}" \
102+
man-db="${MAN_DB_VERSION}" \
103+
psmisc="${PSMISC_VERSION}" \
104+
procps="${PROCPS_VERSION}" \
105+
ripgrep="${RIPGREP_VERSION}" \
106+
sudo="${SUDO_VERSION}" \
107+
tree="${TREE_VERSION}" \
108+
unzip="${UNZIP_VERSION}" \
109+
vim="${VIM_VERSION}" && \
110+
apt-get clean && \
111+
rm -rf /var/lib/apt/lists/*
109112

110113
COPY download.sh /usr/local/bin
111114
RUN --mount=type=cache,id=base-downloads-${TARGETARCH},sharing=locked,target=/opt/downloads \

0 commit comments

Comments
 (0)