Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/flex/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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 \
Expand All @@ -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
Expand All @@ -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
Expand Down
16 changes: 8 additions & 8 deletions src/flex/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.6.0",
"version": "0.8.0",
"imageNameSuffix": "flex",
"dockerFile": "src/flex/Dockerfile",
"context": ".",
Expand All @@ -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"
]
}
}
}
Loading