Skip to content

Use latest version of Nginx, 1.29.6 #6473

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
cbeauchesne merged 3 commits into from
Mar 13, 2026
+1 −76
Merged

Use latest version of Nginx, 1.29.6 #6473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f0a356
Remove wrong comments
xlamorlette-datadog Mar 11, 2026
d7f1aa2
Remove get_circleci_artifact() since we don't use anymore CircleCI
xlamorlette-datadog Mar 11, 2026
ad8a376
Update Nginx version to latest, 1.29.6
xlamorlette-datadog Mar 11, 2026
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
2 changes: 1 addition & 1 deletion utils/build/docker/cpp_nginx/nginx.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM debian:bookworm-slim

ARG NGINX_VERSION="1.29.5"
ARG NGINX_VERSION="1.29.6"
ENV NGINX_VERSION=${NGINX_VERSION}

RUN groupadd --system --gid 101 nginx \
Expand Down
75 changes: 0 additions & 75 deletions utils/scripts/load-binary.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#
# * Agent: Docker hub datadog/agent-dev:master-py3
# * cpp_httpd: Github action artifact
# * cpp_nginx: From circle ci
Copy link
Contributor

@zacharycmontoya zacharycmontoya Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't seem to write a suggestion since you removed the line, but you should replace From circle ci with Github action artifact

Copy link
Contributor Author

@xlamorlette-datadog xlamorlette-datadog Mar 12, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well, I think this comment is actually useless (*), and one can see that other comments are wrong (*) and that several components are missing in this list.

(*): always prefer clear naming in code rather than a comment that can become out of sync with the code ;-)

# * Golang: github.com/DataDog/dd-trace-go/v2@main
# * .NET: ghcr.io/datadog/dd-trace-dotnet
# * Java: S3
Expand Down Expand Up @@ -51,79 +50,6 @@ assert_target_branch_is_not_set() {
exit 1
}

get_circleci_artifact() {

SLUG=$1
WORKFLOW_NAME=$2
JOB_NAME=$3
ARTIFACT_PATTERN=$4

echo "CircleCI: https://app.circleci.com/pipelines/$SLUG?branch=master"
PIPELINES=$(curl --silent https://circleci.com/api/v2/project/$SLUG/pipeline?branch=master -H "Circle-Token: $CIRCLECI_TOKEN")

for i in {0..30}; do
PIPELINE_ID=$(echo $PIPELINES| jq -r ".items[$i].id")
PIPELINE_NUMBER=$(echo $PIPELINES | jq -r ".items[$i].number")

echo "Trying pipeline #$i $PIPELINE_NUMBER/$PIPELINE_ID"
WORKFLOWS=$(curl --silent https://circleci.com/api/v2/pipeline/$PIPELINE_ID/workflow -H "Circle-Token: $CIRCLECI_TOKEN")

QUERY=".items[] | select(.name == \"$WORKFLOW_NAME\") | .id"
WORKFLOW_IDS=$(echo $WORKFLOWS | jq -r "$QUERY")

if [ ! -z "$WORKFLOW_IDS" ]; then

for WORKFLOW_ID in $WORKFLOW_IDS; do
echo "=> https://app.circleci.com/pipelines/$SLUG/$PIPELINE_NUMBER/workflows/$WORKFLOW_ID"

JOBS=$(curl --silent https://circleci.com/api/v2/workflow/$WORKFLOW_ID/job -H "Circle-Token: $CIRCLECI_TOKEN")

QUERY=".items[] | select(.name == \"$JOB_NAME\" and .status==\"success\")"
JOB=$(echo $JOBS | jq "$QUERY")

if [ ! -z "$JOB" ]; then
break
fi
done

if [ ! -z "$JOB" ]; then
break
fi
fi
done

if [ -z "$JOB" ]; then
echo "Oooops, I did not found any successful pipeline"
exit 1
fi

JOB_NUMBER=$(echo $JOB | jq -r ".job_number")
JOB_ID=$(echo $JOB | jq -r ".id")

echo "Job number/ID: $JOB_NUMBER/$JOB_ID"
echo "Job URL: https://app.circleci.com/pipelines/$SLUG/$PIPELINE_NUMBER/workflows/$WORKFLOW_ID/jobs/$JOB_NUMBER"

ARTIFACTS=$(curl --silent https://circleci.com/api/v2/project/$SLUG/$JOB_NUMBER/artifacts -H "Circle-Token: $CIRCLECI_TOKEN")
QUERY=".items[] | select(.path | test(\"$ARTIFACT_PATTERN\"))"
readarray -t ARTIFACT_URLS < <(jq -r "$QUERY | .url" <<< "$ARTIFACTS")

if [[ ${#ARTIFACT_URLS[@]} -eq 0 ]]; then
echo "Oooops, I did not found any artifact that satisfy this pattern: $ARTIFACT_PATTERN. Here is the list:"
echo $ARTIFACTS | jq -r ".items[] | .path"
exit 1
fi
echo "${ARTIFACT_URLS[@]}"

local aurl= aname=
for aurl in "${ARTIFACT_URLS[@]}"; do
aname="${aurl##*/}"
echo "Artifact URL: $aurl"
echo "Artifact Name: $aname"
echo "Downloading artifact..."
curl --silent -L "$aurl" --output "$aname"
done
}

get_github_action_artifact() {
rm -rf artifacts artifacts.zip

Expand Down Expand Up @@ -296,7 +222,6 @@ elif [ "$TARGET" = "haproxy" ]; then

elif [ "$TARGET" = "cpp" ]; then
assert_version_is_dev
# get_circleci_artifact "gh/DataDog/dd-opentracing-cpp" "build_test_deploy" "build" "TBD"
# PROFILER: The main version is stored in s3, though we can not access this in CI
# Not handled for now for system-tests. this handles artifact for parametric
LIBRARY_TARGET_BRANCH="${LIBRARY_TARGET_BRANCH:-main}"
Expand Down
Loading