Skip to content

Commit 06d6048

Browse files
committed
Add system-scope config var in container
So installation_config tests can pass. This also adjusts the RUN script in the dockerfile to show each command before it runs and to make sure it is not overwriting files unintentionally, and adds a convenience script outside for building the image.
1 parent 26240d2 commit 06d6048

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
FROM ghcr.io/cross-rs/s390x-unknown-linux-gnu:latest
22

3-
RUN apt-get update && \
3+
RUN set -xC && \
4+
apt-get update && \
45
apt-get install apt-transport-https && \
56
echo 'deb https://ppa.launchpadcontent.net/git-core/ppa/ubuntu xenial main' > \
67
/etc/apt/sources.list.d/git-core-ubuntu-ppa-xenial.list && \
78
apt-key adv --keyserver keyserver.ubuntu.com \
89
--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \
910
apt-get update && \
1011
apt-get install --no-install-recommends -y git && \
11-
rm -rf /var/lib/apt/lists/*
12+
rm -rf /var/lib/apt/lists/* && \
13+
git config --system gitoxide.imaginary.arbitraryVariable arbitraryValue
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/sh
2+
set -e
3+
mkdir empty-context
4+
docker build -f etc/docker/Dockerfile.test-cross-s390x \
5+
-t cross-rs-gitoxide/s390x-unknown-linux-gnu empty-context

0 commit comments

Comments
 (0)