vbatts/containers-bsi
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #40 from vbatts/no_output

Browse source 
Dockerfile: no default output directory
This commit is contained in:
Daniel J Walsh 2019-09-28 08:25:04 +02:00 committed by GitHub
commit f3e23d60dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -4,8 +4,4 @@ RUN dnf install -y jq skopeo findutils file 'dnf-command(download)'
COPY ./BuildSourceImage.sh /usr/local/bin/BuildSourceImage.sh COPY ./BuildSourceImage.sh /usr/local/bin/BuildSourceImage.sh
RUN mkdir -p /output
ENV OUTPUT_DIR=/output
VOLUME /output
ENTRYPOINT ["/usr/local/bin/BuildSourceImage.sh", "-b", "/tmp/"] ENTRYPOINT ["/usr/local/bin/BuildSourceImage.sh", "-b", "/tmp/"]

2
test/01-from_rpms.bats
View file

@ -7,7 +7,7 @@ load helpers
d=$(mktemp -d) d=$(mktemp -d)
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src run_ctr -v $(pwd)/.testprep/srpms/:/src:ro --mount type=bind,source=${d},destination=/output $CTR_IMAGE -s /src -o /output
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
[[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]] [[ ${lines[0]} =~ "[SrcImg][INFO] calling source collection drivers" ]]
# get the number of the last line # get the number of the last line

2
test/02-from_image_ref.bats
View file

@ -8,7 +8,7 @@ load helpers
echo "temporary directory: ${d}" echo "temporary directory: ${d}"
ref="registry.fedoraproject.org/fedora-minimal" ref="registry.fedoraproject.org/fedora-minimal"
run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}" run_ctr --mount type=bind,source=${d},destination=/output $CTR_IMAGE -i "${ref}" -o /output
[ "$status" -eq 0 ] [ "$status" -eq 0 ]
#echo ${lines[@]} #echo ${lines[@]}
[[ ${lines[0]} =~ "Getting image source signatures" ]] [[ ${lines[0]} =~ "Getting image source signatures" ]]