Skip to content

Commit

Permalink
Merge pull request #87 from agardnerIT/remove_standalone_har-to-otel_…
Browse files Browse the repository at this point in the history
…tracepusher

remove standalone tracepusher. Build from main copy.
  • Loading branch information
agardnerIT authored Jan 7, 2024
2 parents 761a428 + dcfc06f commit 3fe4044
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 461 deletions.
9 changes: 5 additions & 4 deletions har-to-otel/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Stage 1: Copy all files into the build-env container
FROM python:3-slim AS build-env
WORKDIR /app
COPY har-to-otel.py /app
COPY har-to-otel/har-to-otel.py /app
COPY tracepusher.py /app
COPY requirements.txt /app
RUN pip install --no-cache-dir -r /app/requirements.txt
Expand All @@ -12,11 +12,12 @@ FROM gcr.io/distroless/python3

COPY --from=build-env /app /app
# Copy site-packages (which contains the 'requests' module from 'build-env' into the new image)
COPY --from=build-env /usr/local/lib/python3.12/site-packages /usr/local/lib/python3.12/site-packages
COPY --from=build-env /usr/local/lib/python3.11/site-packages /usr/local/lib/python3.11/site-packages
WORKDIR /app
# Make sure Python knows where to find the 'requests' module
ENV PYTHONPATH=/usr/local/lib/python3.12/site-packages
ENV PYTHONPATH=/usr/local/lib/python3.11/site-packages

ENTRYPOINT ["python", "./har-to-otel.py"]

# docker buildx build --platform linux/arm64,linux/amd64 -t har-to-otel:dev -f ./Dockerfile .
# Run from main directory (not har-to-otel)
# docker buildx build --platform linux/arm64,linux/amd64 -t har-to-otel:dev -f har-to-otel/Dockerfile .
3 changes: 0 additions & 3 deletions har-to-otel/requirements.txt

This file was deleted.

Loading

0 comments on commit 3fe4044

Please sign in to comment.