From 0836846316e11b0518d2c9ba20c74e3f50070e5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jens=20Pl=C3=BCddemann?= <jens.plueddemann@novatec-gmbh.de>
Date: Fri, 17 May 2024 08:21:19 +0200
Subject: [PATCH] fixed workflow

---
 .devcontainer.json |  4 +--
 Dockerfile         |  7 ++---
 Dockerfile copy    | 65 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 8 deletions(-)
 create mode 100644 Dockerfile copy

diff --git a/.devcontainer.json b/.devcontainer.json
index 0624822..98e072e 100644
--- a/.devcontainer.json
+++ b/.devcontainer.json
@@ -3,9 +3,7 @@
 	"workspaceFolder": "/workspaces/opentelemetry-training/labs",
 	"image": "ghcr.io/novatecconsulting/opentelemetry-training-application:lf-initial",
 	"runArgs": [
-		"--init",
-		"--privileged",
-		"-t"
+		"--privileged"
 	],
 	"overrideCommand": false,
 	"containerEnv": {
diff --git a/Dockerfile b/Dockerfile
index c21b525..e3982b0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,11 +9,7 @@ RUN apk add --update --no-cache \
     sudo \
     bash \
     curl \
-    gcc \
-    g++ \
-    python3-dev \
-    musl-dev \
-    linux-headers \
+    build-base \
     openjdk21-jdk \
     gradle \
     maven \
@@ -31,6 +27,7 @@ RUN pip install \
     Faker \
     opentelemetry-api \
     opentelemetry-sdk \
+    # opentelemetry-exporter-otlp \
     opentelemetry-exporter-prometheus \
     opentelemetry-instrumentation-flask
 
diff --git a/Dockerfile copy b/Dockerfile copy
new file mode 100644
index 0000000..654aaa1
--- /dev/null
+++ b/Dockerfile copy	
@@ -0,0 +1,65 @@
+FROM debian:bookworm-slim
+
+RUN set -eux; \
+	apt-get update; \
+	apt-get install -y --no-install-recommends \
+		ca-certificates \
+		iptables \
+		openssl \
+		pigz \
+		xz-utils \
+	; \
+	rm -rf /var/lib/apt/lists/*
+
+ENV DOCKER_TLS_CERTDIR=/certs
+RUN mkdir /certs /certs/client && chmod 1777 /certs /certs/client
+
+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
+
+
+RUN \
+    apt-get update \
+    apt-get install ca-certificates curl \
+    install -m 0755 -d /etc/apt/keyrings \
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc \
+    chmod a+r /etc/apt/keyrings/docker.asc \
+    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
+RUN apt-get -qq update
+
+RUN apt-get -qq install -y --no-install-recommends \
+    docker-buildx-plugin \
+    docker-compose-plugin \
+    sudo \
+    bash \
+    curl \
+    gradle \
+    maven \
+    python3 \
+    python-is-python3 \
+    pip \
+    python3-setuptools \
+    python3-wheel \
+    python3-psutil \
+    python3-requests
+
+RUN rm /usr/lib/python3.11/EXTERNALLY-MANAGED
+
+RUN pip install \
+    flask \
+    Faker \
+    opentelemetry-api \
+    opentelemetry-sdk \
+    opentelemetry-exporter-prometheus \
+    opentelemetry-exporter-otlp \
+    opentelemetry-instrumentation-flask
+
+WORKDIR /workspaces/opentelemetry-training
+
+EXPOSE 5000
+
+VOLUME /var/lib/docker
+
+ENTRYPOINT ["dockerd-entrypoint.sh"]
+CMD []