Drazen Urch
af9f6e5ca0
* feat(db): add SQL query wrapper for PostgreSQL placeholder conversion - Created query_wrapper module with functions to automatically convert SQLite ? placeholders to PostgreSQL $1, $2, ... format - Updated build.rs to handle mutually exclusive feature flags - Modified one query in mixnodes.rs as proof of concept - Added type conversions for PostgreSQL compatibility (u32->i64, u16->i32) This is a checkpoint commit before converting all queries to use the wrapper. * feat(nym-node-status-api): add PostgreSQL database support via feature flags Implement dual database support for SQLite and PostgreSQL through Cargo feature flags. The implementation uses a query wrapper that automatically converts SQLite-style ? placeholders to PostgreSQL-style $1, $2, ... placeholders at runtime. Key changes: - Add query wrapper functions that handle placeholder conversion - Convert all sqlx::query\! macros to use wrapper functions - Handle type conversions between databases (i64 vs i32) - Add feature-gated implementations for database-specific SQL syntax - Update Makefile with clippy targets for both database features - Document database support in README * feat(nym-node-status-agent): add multi-API support with random selection Agents can now connect to multiple APIs and randomly select one for each testrun: - Accept multiple --server arguments in format "address:port:auth_key" - Randomly shuffle server list before attempting connections - Try each server until a testrun is obtained - Submit results back only to the API that provided the testrun - Continue to next server if one is down or has no testruns available * feat(nym-node-status): implement primary/secondary server architecture - Agent now requests testruns only from primary server (first in list) - Results are submitted to all configured servers in parallel - Secondary servers accept external testruns via new v2 endpoint - Added auto-creation of gateway and testrun records on secondary servers - New database queries: get_or_create_gateway, insert_external_testrun - Client library enhanced with submit_results_with_context method * Bump Node status API version * Fix build workdir * Bump to 3.1.4 * Fix types and queries * 3.1.6 * Fix gateway perf, bump 3.1.7 * NodeId -> i32, 3.1.8 * Bump agent version * i64 -> i32 * Use image yq * Migration and more types * Update remaining JSONB columns * Simplify server config * Update build path * Change delimiter * bump agent * Split up pg and sqlite builds * More typing fixes, build-and-push script * Fix Dockerfile-pg * Bump node-status-api * TYping * Agent build script * More logging around testruns * Fail loudly on read errors * Cleanup * Debug get gateways query * Fix get_gateways query * Use pg cert, 3.1.16 * Submit regular results to primary server * Bump freshenss cutoff * Update Cargo.lock * fix: resolve rebase conflicts and compilation errors After rebasing onto develop, fixed several issues: - Fixed borrowed data escapes error by using sqlx::query directly in transaction functions - Removed unused imports and cleaned up code - Maintained database-specific implementations for transaction functions * fmt * Make PG default to make lives easier * Performance improvements for Explorer v2 * Fix sqlite build * Fix PG migration * Tests round 1 * DB tests * More tests * And some more tests * And some more, more tests * cargo fmt * Fix some failing lints * Fix lioness version problems * Clippy in tests --------- Co-authored-by: dynco-nym <173912580+dynco-nym@users.noreply.github.com>
42 lines
1.4 KiB
Docker
42 lines
1.4 KiB
Docker
# this will only work with VPN, otherwise remove the harbor part
|
|
FROM harbor.nymte.ch/dockerhub/rust:latest AS builder
|
|
|
|
ARG GIT_REF=main
|
|
|
|
RUN apt update && apt install -yy libdbus-1-dev pkg-config libclang-dev
|
|
|
|
# Install go
|
|
RUN wget https://go.dev/dl/go1.22.5.linux-amd64.tar.gz -O go.tar.gz
|
|
RUN tar -xzvf go.tar.gz -C /usr/local
|
|
|
|
RUN git clone https://github.com/nymtech/nym-vpn-client /usr/src/nym-vpn-client
|
|
RUN cd /usr/src/nym-vpn-client && git checkout $GIT_REF
|
|
ENV PATH=/go/bin:/usr/local/go/bin:$PATH
|
|
WORKDIR /usr/src/nym-vpn-client/nym-vpn-core
|
|
RUN cargo build --release --package nym-gateway-probe
|
|
|
|
COPY ./ /usr/src/nym
|
|
WORKDIR /usr/src/nym/nym-node-status-api/nym-node-status-agent
|
|
RUN cargo build --release
|
|
|
|
#-------------------------------------------------------------------
|
|
# The following environment variables are required at runtime:
|
|
#
|
|
# NODE_STATUS_AGENT_SERVER_ADDRESS
|
|
# NODE_STATUS_AGENT_SERVER_PORT
|
|
#
|
|
# see https://github.com/nymtech/nym/blob/develop/nym-node-status-agent/src/cli.rs for details
|
|
#-------------------------------------------------------------------
|
|
|
|
FROM harbor.nymte.ch/dockerhub/ubuntu:24.04
|
|
|
|
RUN apt-get update && apt-get install -y ca-certificates
|
|
|
|
WORKDIR /nym
|
|
|
|
COPY --from=builder /usr/src/nym/target/release/nym-node-status-agent ./
|
|
COPY --from=builder /usr/src/nym-vpn-client/nym-vpn-core/target/release/nym-gateway-probe ./
|
|
|
|
ENV NODE_STATUS_AGENT_PROBE_PATH=/nym/nym-gateway-probe
|
|
ENTRYPOINT [ "/nym/nym-node-status-agent", "run-probe" ]
|