From fd6e612c5a916d5c30e8005ae0496708c860ec0f Mon Sep 17 00:00:00 2001 From: Harold McGinnis Date: Fri, 11 Jul 2025 11:16:03 -0400 Subject: [PATCH 1/3] CFA-229 :sparkles: update service flags for parent directory style --- src/flex/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/flex/Dockerfile b/src/flex/Dockerfile index 9d554e0..80b3ab9 100644 --- a/src/flex/Dockerfile +++ b/src/flex/Dockerfile @@ -19,8 +19,8 @@ RUN set -xe \ # Create user (required for the agents command to work), generate comms files, enable auto-attach RUN set -xe \ && /contrast/service/x86_64/contrast-flex-service install-user \ - && /contrast/service/x86_64/contrast-flex-service --comms-dir "/contrast/comms" --agents-dir "/contrast/agents" agents \ - && /contrast/service/x86_64/contrast-flex-service --comms-dir "/contrast/comms" --agents-dir "/contrast/agents" auto-attach set true + && /contrast/service/x86_64/contrast-flex-service --comms-parent-dir "/contrast" --agents-parent-dir "/contrast" agents \ + && /contrast/service/x86_64/contrast-flex-service --comms-parent-dir "/contrast" --agents-parent-dir "/contrast" auto-attach set true FROM --platform=linux/amd64 busybox:stable AS final-amd64 RUN set -xe \ From a415e338ff1c6accb4a43ec1df2e0b41eba1678c Mon Sep 17 00:00:00 2001 From: Harold McGinnis Date: Fri, 11 Jul 2025 12:16:39 -0400 Subject: [PATCH 2/3] CFA-229 :pushpin: update flex agent version --- src/flex/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flex/Dockerfile b/src/flex/Dockerfile index 80b3ab9..4732b67 100644 --- a/src/flex/Dockerfile +++ b/src/flex/Dockerfile @@ -7,7 +7,7 @@ RUN set -xe \ && apt-get update \ && apt-get install -y curl -ARG VERSION=0.6.0 +ARG VERSION=0.8.0 # Download the flex-agent package, untar RUN set -xe \ From 11d6ca6f7925985d9b5987ca89ddb51c6688d37e Mon Sep 17 00:00:00 2001 From: Harold McGinnis Date: Fri, 11 Jul 2025 12:34:29 -0400 Subject: [PATCH 3/3] CFA-229 :pushpin: udpate 0.6.0 to 0.8.0 for all args --- src/flex/Dockerfile | 4 ++-- src/flex/manifest.json | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/flex/Dockerfile b/src/flex/Dockerfile index 4732b67..4ab1b48 100644 --- a/src/flex/Dockerfile +++ b/src/flex/Dockerfile @@ -30,7 +30,7 @@ COPY ./src/shared/entrypoint.sh /entrypoint.sh COPY --from=builder /contrast /contrast RUN mkdir -p /contrast/injector \ && cp /contrast/service/x86_64/agent_injector.so /contrast/injector -ARG VERSION=0.6.0 +ARG VERSION=0.8.0 ENV CONTRAST_MOUNT_PATH=/contrast-init \ CONTRAST_VERSION=${VERSION} \ CONTRAST_AGENT_TYPE=flex @@ -45,7 +45,7 @@ COPY ./src/shared/entrypoint.sh /entrypoint.sh COPY --from=builder /contrast /contrast RUN mkdir -p /contrast/injector \ && cp /contrast/service/aarch64/agent_injector.so /contrast/injector -ARG VERSION=0.6.0 +ARG VERSION=0.8.0 ENV CONTRAST_MOUNT_PATH=/contrast-init \ CONTRAST_VERSION=${VERSION} \ CONTRAST_AGENT_TYPE=flex diff --git a/src/flex/manifest.json b/src/flex/manifest.json index c90389a..71016e6 100644 --- a/src/flex/manifest.json +++ b/src/flex/manifest.json @@ -1,5 +1,5 @@ { - "version": "0.6.0", + "version": "0.8.0", "imageNameSuffix": "flex", "dockerFile": "src/flex/Dockerfile", "context": ".", @@ -9,12 +9,12 @@ "expects": [ "image-manifest.json", "injector/agent_injector.so", - "comms/flex_agent.auto_attach", - "comms/dotnet-core-arm64-default", - "comms/dotnet-core-x64-default", - "comms/java-default", - "comms/node-default", - "comms/python-default" + "flex-comms/flex_agent.auto_attach", + "flex-comms/dotnet-core-arm64-default", + "flex-comms/dotnet-core-x64-default", + "flex-comms/java-default", + "flex-comms/node-default", + "flex-comms/python-default" ] } -} +} \ No newline at end of file