Skip to content

Commit

Permalink
pinned python version
Browse files Browse the repository at this point in the history
  • Loading branch information
Jens Plüddemann committed Sep 16, 2024
1 parent b61493a commit c2e8404
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 13 deletions.
18 changes: 6 additions & 12 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gradle:8-jdk22 AS dind
FROM maven:3-eclipse-temurin-21 AS dind

ARG DEBIAN_FRONTEND=noninteractive
ENV PIP_ROOT_USER_ACTION=ignore
Expand All @@ -16,8 +16,8 @@ RUN set -eux; \
procps \
supervisor

COPY --from=docker:26-dind /usr/local/bin /usr/local/bin
COPY --from=docker:26-dind /usr/local/libexec/docker/cli-plugins /usr/local/libexec/docker/cli-plugins
COPY --from=docker:27-dind /usr/local/bin /usr/local/bin
COPY --from=docker:27-dind /usr/local/libexec/docker/cli-plugins /usr/local/libexec/docker/cli-plugins

COPY entrypoint.sh /usr/local/bin
RUN chmod +x /usr/local/bin/entrypoint.sh
Expand Down Expand Up @@ -45,15 +45,9 @@ RUN apt-get update; \

RUN rm -rf /usr/lib/python3*/EXTERNALLY-MANAGED

RUN pip install \
flask \
Faker \
requests \
opentelemetry-api \
opentelemetry-sdk \
opentelemetry-exporter-prometheus \
opentelemetry-exporter-otlp \
opentelemetry-instrumentation-flask
COPY requirements.txt /usr/local/src/requirements.txt

RUN pip install -r /usr/local/src/requirements.txt

WORKDIR /workspace

Expand Down
5 changes: 4 additions & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{
"name": "otel-getting-started",
"workspaceFolder": "/workspaces/opentelemetry-training/exercises",
"image": "ghcr.io/novatecconsulting/opentelemetry-training-application:update-gh-action-and-docker-env",
// "image": "ghcr.io/novatecconsulting/opentelemetry-training-application:latest",
"build": {
"dockerfile": "Dockerfile"
},
"overrideCommand": false,
"runArgs": [
"--privileged"
Expand Down
9 changes: 9 additions & 0 deletions .devcontainer/requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Faker==28.4.1
Flask==3.0.3
opentelemetry-api==1.27.0
opentelemetry-exporter-otlp==1.27.0
opentelemetry-exporter-prometheus==0.48b0
opentelemetry-instrumentation-flask==0.48b0
opentelemetry-sdk==1.27.0
opentelemetry-semantic-conventions==0.48b0
requests==2.32.3

0 comments on commit c2e8404

Please sign in to comment.