File tree Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Expand file tree Collapse file tree 1 file changed +5
-10
lines changed Original file line number Diff line number Diff line change @@ -5,23 +5,18 @@ FROM ghcr.io/cross-rs/${TARGET}:latest
5
5
ARG TARGET
6
6
7
7
RUN set -uC && \
8
- apt-get update && \
9
- apt-get install --no-install-recommends -y apt-transport-https gnupg && \
10
8
apt_suffix= && \
11
9
if target_arch="$(dpkg-architecture --host-type "$TARGET" --query DEB_HOST_ARCH)"; then \
12
10
dpkg --add-architecture "$target_arch" && \
13
11
apt_suffix=":$target_arch"; \
14
12
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 && \
23
16
apt-get update && \
24
17
apt-get install --no-install-recommends -y "git$apt_suffix" jq patch && \
18
+ apt-get purge --autoremove software-properties-common && \
19
+ apt-get clean && \
25
20
rm -rf /var/lib/apt/lists/* && \
26
21
if test -f /android-runner; then \
27
22
sed -i.orig 's/^export LD_PRELOAD=/test "${NO_PRELOAD_CXX:-0}" != 0 || &/' \
You can’t perform that action at this time.
0 commit comments