Skip to content

Commit 412f33f

Browse files
committed
more..
1 parent 6fca9f8 commit 412f33f

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

.devcontainer/Dockerfile.conan

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright The OpenTelemetry Authors
22
# SPDX-License-Identifier: Apache-2.0
3-
FROM ubuntu:24.04
3+
FROM ubuntu:24.04@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
44

55
RUN apt update && apt install -y \
66
build-essential \
@@ -19,7 +19,7 @@ RUN apt update && apt install -y \
1919
libtool \
2020
python3-pip
2121

22-
RUN pip install conan --break-system-packages
22+
RUN pip install "conan==2.15.1" --break-system-packages
2323

2424
ARG USER_UID=1000
2525
ARG USER_GID=1000

.devcontainer/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ ENV IS_CONTAINER_BUILD=true
4747

4848
COPY ./.devcontainer/customize_container.sh /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
4949
RUN /tmp/opentelemetry_cpp/devcontainer/customize_container.sh
50-
RUN apt install -y npm && npm install -g markdownlint-cli
50+
RUN apt install -y npm && npm install -g markdownlint-cli@0.44.0
5151

5252
USER devuser
5353

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ jobs:
913913
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
914914

915915
- name: install markdownlint-cli
916-
run: sudo npm install -g markdownlint-cli
916+
run: sudo npm install -g markdownlint-cli@0.44.0
917917

918918
- name: run markdownlint
919919
run: markdownlint .
@@ -982,7 +982,7 @@ jobs:
982982
- name: install dependencies
983983
run: |
984984
sudo apt update && sudo apt install python3-pip
985-
sudo pip3 install aiohttp
985+
sudo pip3 install aiohttp==3.11.18
986986
- name: run w3c trace-context test suite
987987
env:
988988
SPEC_LEVEL: 1

.github/workflows/cmake_install.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -209,8 +209,8 @@ jobs:
209209
submodules: 'recursive'
210210
- name: Install Conan
211211
run: |
212-
python3 -m pip install --upgrade pip
213-
pip install "conan>=2.0,<3"
212+
python3 -m pip install pip==25.0.1
213+
pip install "conan==2.15.1"
214214
conan profile detect --force
215215
- name: Install or build all dependencies with Conan
216216
run: |
@@ -247,8 +247,8 @@ jobs:
247247
submodules: 'recursive'
248248
- name: Install Conan
249249
run: |
250-
python3 -m pip install --upgrade pip
251-
pip install "conan>=2.0,<3"
250+
python3 -m pip install pip==25.0.1
251+
pip install "conan==2.15.1"
252252
conan profile detect --force
253253
- name: Install or build all dependencies with Conan
254254
run: |

docker/ubuntuLatest/Dockerfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
FROM ubuntu:latest@sha256:1e622c5f073b4f6bfad6632f2616c7f59ef256e96fe78bf6a595d1dc4376ac02
5+
ENV DEBIAN_FRONTEND=noninteractive
6+
57
WORKDIR /work
68

79
#install grpc and abseil

functional/otlp/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
# SPDX-License-Identifier: Apache-2.0
33

44
FROM otel/opentelemetry-collector:v0.123.0@sha256:e5e4a13f0eaa98e7ca11dd809be04018504016888dd764abd4e1277cba87350
5+
COPY . .
56
CMD ["--config", "/otel-cpp/otel-config.yaml"]
67
EXPOSE 4317
78
EXPOSE 4318

0 commit comments

Comments
 (0)