Skip to content

Commit ec63b31

Browse files
committed
Show that the problem still happens with add-apt-repository
Thus, the lightweight manual approach used before isn't the cause.
1 parent 154b1a6 commit ec63b31

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

etc/docker/Dockerfile.test-cross

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,18 @@ FROM ghcr.io/cross-rs/${TARGET}:latest
55
ARG TARGET
66

77
RUN set -uC && \
8-
apt-get update && \
9-
apt-get install --no-install-recommends -y apt-transport-https gnupg && \
108
apt_suffix= && \
119
if target_arch="$(dpkg-architecture --host-type "$TARGET" --query DEB_HOST_ARCH)"; then \
1210
dpkg --add-architecture "$target_arch" && \
1311
apt_suffix=":$target_arch"; \
1412
fi && \
15-
release="$(sed -n 's/^VERSION_CODENAME=//p' /etc/os-release)" && \
16-
for pocket in "$release" "$release-security" "$release-updates" "$release-backports"; do \
17-
echo "deb http://ports.ubuntu.com/ubuntu-ports/ $pocket main universe"; \
18-
done >/etc/apt/sources.list.d/ports.list && \
19-
echo "deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu $release main" \
20-
>/etc/apt/sources.list.d/git-core-ubuntu-ppa.list && \
21-
apt-key adv --keyserver keyserver.ubuntu.com \
22-
--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \
13+
apt-get update && \
14+
apt-get install --no-install-recommends -y software-properties-common && \
15+
add-apt-repository -y ppa:git-core/ppa && \
2316
apt-get update && \
2417
apt-get install --no-install-recommends -y "git$apt_suffix" jq patch && \
18+
apt-get purge --autoremove software-properties-common && \
19+
apt-get clean && \
2520
rm -rf /var/lib/apt/lists/* && \
2621
if test -f /android-runner; then \
2722
sed -i.orig 's/^export LD_PRELOAD=/test "${NO_PRELOAD_CXX:-0}" != 0 || &/' \

0 commit comments

Comments
 (0)