Add `jq` to container; simplify container build command

Installing `jq` in the container allows the `ask::askpass_only` and `ask::username_password` to pass (they use `jq`).

Eliah Kagan committed 1 year ago

Commit 3a296ae1 parent a7db5882 files · +2 −5Browse files

Unified · Split

2 files

etc/docker/Dockerfile.test-cross-s390x +1 −1
etc/docker/build-test-cross-s390x-image.sh +1 −4

etc/docker/Dockerfile.test-cross-s390x+1−1

@@ -8,6 +8,6 @@ RUN set -xC && \ · 7 unmodified lines
8	apt-key adv --keyserver keyserver.ubuntu.com \	8	apt-key adv --keyserver keyserver.ubuntu.com \
9	--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \	9	--recv-keys F911AB184317630C59970973E363C90F8F1B6217 && \
10	apt-get update && \	10	apt-get update && \
11	apt-get install --no-install-recommends -y git && \	11	apt-get install --no-install-recommends -y git jq && \
12	rm -rf /var/lib/apt/lists/* && \	12	rm -rf /var/lib/apt/lists/* && \
13	git config --system gitoxide.imaginary.arbitraryVariable arbitraryValue	13	git config --system gitoxide.imaginary.arbitraryVariable arbitraryValue

etc/docker/build-test-cross-s390x-image.sh+1−4

@@ -1,5 +1,2 @@
1	#!/bin/sh	1	#!/bin/sh
2	set -e	2	docker build -t cross-rs-gitoxide/s390x-unknown-linux-gnu - <etc/docker/Dockerfile.test-cross-s390x
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