From e4e89a73e1a2a623aecff8df4eae71c0628ae971 Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com> Date: Tue, 21 Oct 2025 07:32:14 +0000 Subject: [PATCH 1/5] influxd-3.5: updated --- influxd-3.5.yaml | 159 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 159 insertions(+) create mode 100644 influxd-3.5.yaml diff --git a/influxd-3.5.yaml b/influxd-3.5.yaml new file mode 100644 index 00000000000..c94cd42ee85 --- /dev/null +++ b/influxd-3.5.yaml @@ -0,0 +1,159 @@ +package: + name: influxd-3.5 + # Note that we needed to pin the version of rust to 1.82.0 + # since this release fails to compile with 1.83.0. There is + # a commit which will fix it but it is not released yet. + # So, for the next bump, please remove the `rust=1.82.0` pinning. + version: "3.5.0" + epoch: 0 + description: Scalable datastore for metrics, events, and real-time analytics + copyright: + - license: MIT + dependencies: + provides: + - influxd=${{package.full-version}} + runtime: + - merged-usrsbin + - python3 + - wolfi-baselayout + +environment: + contents: + packages: + - build-base + - busybox + - ca-certificates-bundle + - coreutils + - libprotobuf + - lld + - protobuf-dev + - protoc + - python3 + - python3-dev + - rust + - rustup + +var-transforms: + - from: ${{package.version}} + match: ^(\d+)\.\d+\.\d+$ + replace: "$1" + to: major-version + +pipeline: + - uses: git-checkout + with: + repository: https://github.com/influxdata/influxdb + tag: v${{package.version}} + expected-commit: 384c457ef5f0d5ca4981b22855e411d8cac2688e + destination: influxdb + + - runs: | + # TODO - move these + export CARGO_INCREMENTAL=yes + export CARGO_NET_GIT_FETCH_WITH_CLI=false + export PROFILE=release + export FEATURES=aws,gcp,azure,jemalloc_replacing_malloc + export PACKAGE=influxdb3 + + # Bump the thread count up, otherwise builds take a long time + export CARGO_JOBS=12 + + + # Note: the static linking used in python standalone doesn't play + # nicely with packaging. + # + # We therefore don't use python standalone and instead pin a specific + # version of python as a dependency (which has the benefit that we'll + # continue to remediate CVEs) + + # Create a directory to output build to. This is kept consistent with + # upstream for ease of maintenance + mkdir /influxdb3/target -p + + # Build + cd influxdb + rustup toolchain install + + cargo build --target-dir /influxdb3/target --package="$PACKAGE" --profile="$PROFILE" --no-default-features --features="$FEATURES" + + objcopy --compress-debug-sections "/influxdb3/target/$PROFILE/$PACKAGE" + + # This is where we start to deviate, we want to put the files where melange expects + #mkdir -p ${{targets.destdir}}/var/lib/influxdb3 + #mkdir -p ${{targets.destdir}}/usr/lib/influxdb3 + mkdir -p ${{targets.destdir}}/usr/bin + + cp "/influxdb3/target/$PROFILE/$PACKAGE" ${{targets.destdir}}/usr/bin/$PACKAGE + + # We're not building an image yet, so skip creation of the plugins dir + # mkdir -p ${{targets.destdir}}/plugins + + - uses: strip + +subpackages: + - name: ${{package.name}}-oci-entrypoint + pipeline: + - runs: | + mkdir -p ${{targets.subpkgdir}}/usr/bin + mv entrypoint.sh ${{targets.subpkgdir}}/usr/bin/ + dependencies: + runtime: + - bash + - busybox + - merged-usrsbin + - wolfi-baselayout + - yq + # test added by a robot (binary) + test: + pipeline: + - runs: | + stat /usr/bin/entrypoint.sh + +update: + enabled: true + github: + identifier: influxdata/influxdb + strip-prefix: v + tag-filter: v3.5. + +test: + environment: + contents: + packages: + - curl + - py3-psutil + pipeline: + - name: Version Tests + runs: | + influxdb3 --help + influxdb3 --version + - name: Start the influxd server + uses: test/daemon-check-output + with: + setup: | + mkdir /plugins + start: | + influxdb3 serve --object-store memory \ + --node-id testnode \ + --plugin-dir /plugins + timeout: 30 + expected_output: | + InfluxDB 3 Core server starting + Creating shared query executor + startup time:. + - name: Write data + uses: test/daemon-check-output + with: + setup: | + mkdir /plugins + influxdb3 serve --object-store memory \ + --node-id testnode \ + --plugin-dir /plugins > /dev/null 2>&1 & + sleep 5 + start: | + curl -H "Authorization: Bearer $(influxdb3 create token --admin | grep 'Token:' | cut -d\ -f2)" \ + http://127.0.0.1:8181/write?db=test \ + -d 'cpu,cpu=1234 user=1.0,system=0.1' -s -w 'Result: %{http_code}\n' + timeout: 30 + expected_output: | + Result: 204 From f79e3c6cdfea83c8ff79c8364770770722db44e8 Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com> Date: Tue, 21 Oct 2025 07:32:16 +0000 Subject: [PATCH 2/5] influxd-3.5: updated patch directory --- influxd-3.5/entrypoint.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100755 influxd-3.5/entrypoint.sh diff --git a/influxd-3.5/entrypoint.sh b/influxd-3.5/entrypoint.sh new file mode 100755 index 00000000000..6c40b7f5e0e --- /dev/null +++ b/influxd-3.5/entrypoint.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +set -eu -o pipefail + +args=( "$@" ) +for i in "${!args[@]}"; do + args[$i]="$(echo "${args[$i]}" | envsubst)" +done + +exec "$PACKAGE" "${args[@]}" + From 109fd9e39864202059fe7e8c8a5e39d420231432 Mon Sep 17 00:00:00 2001 From: Ben Tasker <2900301+bentasker@users.noreply.github.com> Date: Wed, 22 Oct 2025 15:49:46 +0100 Subject: [PATCH 3/5] fix: correct expected hash The tag was updated so points at a different commit than it originally did Signed-off-by: Ben Tasker <2900301+bentasker@users.noreply.github.com> --- influxd-3.5.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/influxd-3.5.yaml b/influxd-3.5.yaml index c94cd42ee85..b2e6010d987 100644 --- a/influxd-3.5.yaml +++ b/influxd-3.5.yaml @@ -44,7 +44,7 @@ pipeline: with: repository: https://github.com/influxdata/influxdb tag: v${{package.version}} - expected-commit: 384c457ef5f0d5ca4981b22855e411d8cac2688e + expected-commit: a359575c82d87d72f22718df4ab9f092f4b5ba38 destination: influxdb - runs: | From 137f56013cdfbf38ada9624e0495f271adb9ac8d Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Mon, 27 Oct 2025 17:32:51 +0100 Subject: [PATCH 4/5] influxd-3.5: use git update backed Because there are no github releases but there are git tags. Signed-off-by: Arturo Borrero Gonzalez --- influxd-3.5.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/influxd-3.5.yaml b/influxd-3.5.yaml index b2e6010d987..4a72b8ad74d 100644 --- a/influxd-3.5.yaml +++ b/influxd-3.5.yaml @@ -111,10 +111,10 @@ subpackages: update: enabled: true - github: - identifier: influxdata/influxdb + # switched from github (releases) to git (tags) because in v3.5 apparently they forgot to push the release button + git: strip-prefix: v - tag-filter: v3.5. + tag-filter-prefix: v3.5. test: environment: From 4fef3aa0a3725c707bbc0fc0c1fa72febfe8cc1a Mon Sep 17 00:00:00 2001 From: Arturo Borrero Gonzalez Date: Tue, 28 Oct 2025 11:16:50 +0100 Subject: [PATCH 5/5] influxd-3.5: cleanup Cleanup. Signed-off-by: Arturo Borrero Gonzalez --- influxd-3.5.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/influxd-3.5.yaml b/influxd-3.5.yaml index 4a72b8ad74d..963accd0cb5 100644 --- a/influxd-3.5.yaml +++ b/influxd-3.5.yaml @@ -1,9 +1,5 @@ package: name: influxd-3.5 - # Note that we needed to pin the version of rust to 1.82.0 - # since this release fails to compile with 1.83.0. There is - # a commit which will fix it but it is not released yet. - # So, for the next bump, please remove the `rust=1.82.0` pinning. version: "3.5.0" epoch: 0 description: Scalable datastore for metrics, events, and real-time analytics @@ -13,9 +9,7 @@ package: provides: - influxd=${{package.full-version}} runtime: - - merged-usrsbin - python3 - - wolfi-baselayout environment: contents: @@ -100,8 +94,6 @@ subpackages: runtime: - bash - busybox - - merged-usrsbin - - wolfi-baselayout - yq # test added by a robot (binary) test: