Skip to content

Commit e3b1791

Browse files
committed
Install host-arch perl deps, force target arch git to use them
This does cause `git:s390x` to install in the s390x cross container but the changes are not finished -- container creation still fails due to a subsequent attempt to fix missing packages. Assuming `git` can use `perl` from a different architecture, which seems likely since it is invoking it as an interpreter (rather than linking to it), this should be fine, but to limit container bloat some other changes are needed to make it so we don't need the `autoremove` operation to get rid of files only used in setting up the PPA.
1 parent 7686d17 commit e3b1791

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

etc/docker/Dockerfile.test-cross

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,12 @@ RUN set -uC && \
1515
add-apt-repository -y ppa:git-core/ppa && \
1616
apt-get update && \
1717
apt-get install --no-install-recommends -y "libc6$apt_suffix" "libcurl3-gnutls$apt_suffix" \
18-
"libexpat1$apt_suffix" "libpcre2-8-0$apt_suffix" "zlib1g$apt_suffix" "perl$apt_suffix" \
19-
liberror-perl git-man patch jq && \
18+
"libexpat1$apt_suffix" "libpcre2-8-0$apt_suffix" "zlib1g$apt_suffix" perl liberror-perl \
19+
git-man patch jq && \
2020
apt-get download "git$apt_suffix" && \
21-
dpkg --ignore-depends="liberror-perl$apt_suffix" -i ./git[-_]*.deb && \
21+
dpkg --ignore-depends="perl$apt_suffix,liberror-perl$apt_suffix" -i git[-_]*.deb && \
22+
echo INSTALLED/UPGRADED GIT && \
23+
rm git[-_]*.deb && \
2224
apt-get purge --autoremove software-properties-common && \
2325
apt-get clean && \
2426
rm -rf /var/lib/apt/lists/* && \

0 commit comments

Comments
 (0)