Skip to content

Commit 0d6e6e4

Browse files
committed
Manually set up PPA + other fixups
This avoids installing `software-properties-common` in the container, instead manually setting up the PPA again. Accordingly, it is not necessary to uninstall any packages to avoid high bloat in the image, so that is removed. Other cleanup is still done. This also removes the old `git` and packages that were marked as automatically installed that were only needed as its dependencies, and shows details about the `git` that is installed. For s390x, this works to cause the test suite to use a s390x build of `git`, at a reasonably new version as provided by the PPA. That should happen for some other targets, but not all. This therefore shows the `git` version as well as examining the executable to report its architecture while the container is being built. Note that this does not yet appear sufficient to produce the s390x test failures mentioned in GitoxideLabs#1687 and discused in GitoxideLabs#1698 comments. (That might relate to how this is still just testing `max-pure`.)
1 parent a0b65c0 commit 0d6e6e4

File tree

1 file changed

+11
-5
lines changed

1 file changed

+11
-5
lines changed

etc/docker/Dockerfile.test-cross

+11-5
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,23 @@ RUN set -uC && \
1111
apt_suffix=":$target_arch"; \
1212
fi && \
1313
apt-get update && \
14-
apt-get install --no-install-recommends -y software-properties-common && \
15-
add-apt-repository -y ppa:git-core/ppa && \
14+
apt-get install --no-install-recommends -y apt-transport-https gnupg && \
15+
release="$(sed -n 's/^VERSION_CODENAME=//p' /etc/os-release)" && \
16+
echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu $release main" \
17+
>/etc/apt/sources.list.d/git-core-ubuntu-ppa.list && \
18+
apt-key adv --keyserver keyserver.ubuntu.com \
19+
--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \
1620
apt-get update && \
21+
apt-get purge --autoremove -y git && \
1722
apt-get install --no-install-recommends -y "libc6$apt_suffix" "libcurl3-gnutls$apt_suffix" \
1823
"libexpat1$apt_suffix" "libpcre2-8-0$apt_suffix" "zlib1g$apt_suffix" perl liberror-perl \
19-
git-man patch jq && \
24+
git-man file jq patch && \
2025
apt-get download "git$apt_suffix" && \
2126
dpkg --ignore-depends="perl$apt_suffix,liberror-perl$apt_suffix" -i git[-_]*.deb && \
22-
echo INSTALLED/UPGRADED GIT && \
27+
git version --build-options && \
28+
git="$(command -v git)" && \
29+
file -- "$git" && \
2330
rm git[-_]*.deb && \
24-
apt-get purge --autoremove software-properties-common && \
2531
apt-get clean && \
2632
rm -rf /var/lib/apt/lists/* && \
2733
if test -f /android-runner; then \

0 commit comments

Comments
 (0)