Skip to content

Commit

Permalink
fixed workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
Jens Plüddemann committed May 17, 2024
1 parent cf028fa commit 0836846
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 8 deletions.
4 changes: 1 addition & 3 deletions .devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
7 changes: 2 additions & 5 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -31,6 +27,7 @@ RUN pip install \
Faker \
opentelemetry-api \
opentelemetry-sdk \
# opentelemetry-exporter-otlp \
opentelemetry-exporter-prometheus \
opentelemetry-instrumentation-flask

Expand Down
65 changes: 65 additions & 0 deletions Dockerfile copy
Original file line number Diff line number Diff line change
@@ -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 []

0 comments on commit 0836846

Please sign in to comment.