@@ -23,11 +23,13 @@ RUN rm -f /usr/local/bin/sudo && \
23
23
echo "%sudo ALL=(ALL) ALL" >> /etc/sudoers
24
24
<% else %>
25
25
ENV DEBIAN_FRONTEND noninteractive
26
- RUN dpkg --add-architecture <%= foreign_dpkg_arch %> && \
27
- apt-get -y update && \
28
- apt-get install -y sudo wget autoconf cmake curl git-core pkg-config build-essential xz-utils unzip gnupg2 dirmngr && \
29
- apt-get install -y zlib1g-dev:<%= foreign_dpkg_arch %> libreadline-dev:<%= foreign_dpkg_arch %> libsqlite0-dev:<%= foreign_dpkg_arch %> libssl-dev:<%= foreign_dpkg_arch %> libyaml-dev:<%= foreign_dpkg_arch %> libffi-dev:<%= foreign_dpkg_arch %> && \
30
- rm -rf /var/lib/apt/lists/*
26
+ COPY ./build/setup_dpkg_multiarch_for_target.sh /
27
+ RUN /setup_dpkg_multiarch_for_target.sh <%= foreign_dpkg_arch %> ;
28
+
29
+ RUN apt-get -y -qq update && \
30
+ apt-get -y -qq install sudo wget autoconf cmake curl git-core pkg-config build-essential xz-utils unzip gnupg2 dirmngr && \
31
+ apt-get -y -qq install zlib1g-dev:<%= foreign_dpkg_arch %> libreadline-dev:<%= foreign_dpkg_arch %> libsqlite0-dev:<%= foreign_dpkg_arch %> libssl-dev:<%= foreign_dpkg_arch %> libyaml-dev:<%= foreign_dpkg_arch %> libffi-dev:<%= foreign_dpkg_arch %> && \
32
+ rm -rf /var/lib/apt/lists/*;
31
33
<% end %>
32
34
33
35
# Add "rvm" as system group, to avoid conflicts with host GIDs typically starting with 1000
@@ -92,7 +94,6 @@ RUN apt-get -y update && \
92
94
apt-get install -y <%
93
95
if platform =~/darwin/ %> clang python lzma-dev libxml2-dev libssl-dev libc++-10-dev <% end %> <%
94
96
if platform =~/aarch64-linux/ %> gcc-aarch64-linux-gnu g++-aarch64-linux-gnu <% end %> <%
95
- if platform =~/x86_64-linux/ %> gcc-x86-64-linux-gnu g++-x86-64-linux-gnu <% end %> <%
96
97
if platform =~/arm-linux/ %> gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf <% end %> <%
97
98
if platform =~/x86-mingw32/ %> gcc-mingw-w64-i686 g++-mingw-w64-i686 <% end %> <%
98
99
if platform =~/x64-mingw32/ %> gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 <% end %> && \
0 commit comments