Skip to content

Commit 319a81c

Browse files
authored
ci(docker): Make apple container usable in place of docker (#1036)
Signed-off-by: Vincent Boutour <[email protected]>
1 parent a0e7e83 commit 319a81c

File tree

2 files changed

+33
-5
lines changed

2 files changed

+33
-5
lines changed

aws/logs_monitoring/tools/build_bundle.sh

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,21 @@ make_path_absolute() {
5353
)/$(basename "$1")"
5454
}
5555

56+
# Make us of Docker or apple/container seamless
57+
docker_build() {
58+
docker buildx build "${@}"
59+
}
60+
61+
if command -v container >/dev/null 2>&1; then
62+
docker() {
63+
container "${@}"
64+
}
65+
66+
docker_build() {
67+
container build "${@}"
68+
}
69+
fi
70+
5671
../trace_forwarder/scripts/build_linux_go_bin.sh
5772

5873
docker_build_zip() {
@@ -64,7 +79,7 @@ docker_build_zip() {
6479
# between different python runtimes.
6580
temp_dir=$(mktemp -d)
6681

67-
docker buildx build --platform linux/arm64 --file "${DIR}/Dockerfile_bundle" -t "datadog-bundle:$1" .. --no-cache --build-arg "runtime=${PYTHON_VERSION}"
82+
docker_build --platform linux/arm64 --file "${DIR}/Dockerfile_bundle" -t "datadog-bundle:$1" .. --no-cache --build-arg "runtime=${PYTHON_VERSION}"
6883

6984
# Run the image by runtime tag, tar its generated `python` directory to sdout,
7085
# then extract it to a temp directory.

aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,27 @@ cd $(dirname "$0")/..
1313

1414
rm -rf ./bin
1515

16+
# Make us of Docker or apple/container seamless
17+
docker_build() {
18+
docker buildx build "${@}"
19+
}
20+
21+
if command -v container >/dev/null 2>&1; then
22+
docker() {
23+
container "${@}"
24+
}
25+
26+
docker_build() {
27+
container build "${@}"
28+
}
29+
fi
30+
1631
# Install datadogpy in a docker container to avoid the mess from switching
1732
# between different python runtimes.
1833

1934
if [[ $(docker image ls | grep -c golang) -lt 1 ]]; then
20-
docker buildx build --platform linux/arm64 -t golang . --no-cache --build-arg "runtime=python:3.13"
35+
docker_build --platform linux/arm64 -t golang . --no-cache --build-arg "runtime=python:3.13"
2136
fi
2237

23-
id=$(docker create --platform linux/arm64 golang)
24-
docker cp "${id}:/go/src/github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/bin" .
25-
docker rm -v "${id}"
38+
docker run --rm --platform linux/arm64 --volume "$(pwd):/root/bin" golang cp -r /go/src/github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/bin /root/bin
2639
echo "Done creating archive bin"

0 commit comments

Comments
 (0)