Skip to content

ci(docker): Make apple container usable in place of docker #1036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ViBiOh merged 1 commit into from
Dec 15, 2025
+33 −5
Merged

ci(docker): Make apple container usable in place of docker #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion aws/logs_monitoring/tools/build_bundle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,21 @@ make_path_absolute() {
)/$(basename "$1")"
}

# Make us of Docker or apple/container seamless
docker_build() {
docker buildx build "${@}"
}

if command -v container >/dev/null 2>&1; then
docker() {
container "${@}"
}

docker_build() {
container build "${@}"
}
fi

../trace_forwarder/scripts/build_linux_go_bin.sh

docker_build_zip() {
Expand All @@ -64,7 +79,7 @@ docker_build_zip() {
# between different python runtimes.
temp_dir=$(mktemp -d)

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

# Run the image by runtime tag, tar its generated `python` directory to sdout,
# then extract it to a temp directory.
Expand Down
21 changes: 17 additions & 4 deletions aws/logs_monitoring/trace_forwarder/scripts/build_linux_go_bin.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,27 @@ cd $(dirname "$0")/..

rm -rf ./bin

# Make us of Docker or apple/container seamless
docker_build() {
docker buildx build "${@}"
}

if command -v container >/dev/null 2>&1; then
docker() {
container "${@}"
}

docker_build() {
container build "${@}"
}
fi

# Install datadogpy in a docker container to avoid the mess from switching
# between different python runtimes.

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

id=$(docker create --platform linux/arm64 golang)
docker cp "${id}:/go/src/github.com/DataDog/datadog-serverless-functions/aws/logs_monitoring/trace_forwarder/bin" .
docker rm -v "${id}"
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
echo "Done creating archive bin"
Loading