Skip to content

Commit e204b21

Browse files
committed
making dockerfile generation more explicit; fixing Python typo
1 parent 8a30d52 commit e204b21

File tree

3 files changed

+50
-43
lines changed

3 files changed

+50
-43
lines changed

.github/scripts/run-container-test.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def create_docker_image(opts, oci_exe, base_image_name, packages):
120120
])
121121
shell(cmd)
122122

123-
print f"Created Docker image {image_name}. Listing hosted images to be certain:"
123+
print(f"Created Docker image {image_name}. Listing hosted images to be certain:")
124124
shell("docker image ls --all")
125125

126126
return image_name

docker-images/build-all.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

docker-images/build-all.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
build-images.sh

docker-images/build-images.sh

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
#!/bin/bash
2+
set -e
3+
4+
err() {
5+
echo -e >&2 "ERROR: $*\n"
6+
}
7+
8+
die() {
9+
err "$*"
10+
exit 1
11+
}
12+
13+
SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
14+
PROJ_ROOT=$(realpath "$SCRIPT_DIR/..")
15+
16+
if [ -z "$OCI_EXE" ]; then
17+
if which finch > /dev/null 2>/dev/null; then
18+
OCI_EXE=finch
19+
elif which podman >/dev/null 2>/dev/null; then
20+
OCI_EXE=podman
21+
elif which docker >/dev/null 2>/dev/null; then
22+
OCI_EXE=docker
23+
else
24+
die "Cannot find a container executor. Search for docker and podman."
25+
fi
26+
fi
27+
28+
echo "using container executor OCI_EXE=$OCI_EXE"
29+
30+
if [ "$#" -gt 0 ]; then
31+
IMAGES=($@)
32+
else
33+
IMAGES=(
34+
"linux-x64"
35+
"linux-arm64"
36+
"mingw-x64"
37+
)
38+
fi
39+
40+
echo "Building images $IMAGES"
41+
42+
for IMAGE in "${IMAGES[@]}"; do
43+
echo "Building dockcross-$IMAGE..."
44+
$OCI_EXE build -f "$SCRIPT_DIR/$IMAGE/Dockerfile" -t "aws-crt-kotlin/$IMAGE:latest" "$PROJ_ROOT"
45+
$OCI_EXE run --rm "aws-crt-kotlin/$IMAGE:latest" > "$PROJ_ROOT/dockcross-$IMAGE"
46+
chmod ug+x "$PROJ_ROOT/dockcross-$IMAGE"
47+
echo ""
48+
done

0 commit comments

Comments
 (0)