Skip to content

Commit 813845d

Browse files
committed
devctr: update python dependencies
Signed-off-by: alindima <[email protected]>
1 parent e7975d0 commit 813845d

File tree

4 files changed

+360
-242
lines changed

4 files changed

+360
-242
lines changed

tools/devctr/Dockerfile.x86_64

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@ RUN apt-get update \
3838
jq \
3939
libdw-dev \
4040
libiberty-dev \
41-
libssl1.0-dev \
41+
libssl-dev \
42+
libcurl4-openssl-dev \
4243
lsof \
4344
make \
4445
net-tools \
@@ -53,7 +54,6 @@ RUN apt-get update \
5354
zlib1g-dev \
5455
screen \
5556
tzdata \
56-
npm \
5757
xz-utils \
5858
bc \
5959
flex \
@@ -62,9 +62,7 @@ RUN apt-get update \
6262
setuptools \
6363
wheel \
6464
&& python3 -m pip install --upgrade pip \
65-
&& npm install -g @apidevtools/swagger-cli \
66-
&& gem install chef-utils:16.6.14 mdl \
67-
&& rm -rf /var/lib/apt/lists/*
65+
&& gem install chef-utils:16.6.14 mdl
6866

6967
RUN python3 -m pip install poetry
7068
RUN mkdir "$TMP_POETRY_DIR"
@@ -73,6 +71,14 @@ RUN cd "$TMP_POETRY_DIR" \
7371
&& poetry config virtualenvs.create false \
7472
&& poetry install --no-dev --no-interaction
7573

74+
# We need to install node and npm from source because of this issue with the
75+
# ubuntu repository:
76+
# https://bugs.launchpad.net/ubuntu/+source/nodejs/+bug/1794589
77+
RUN (curl -sL https://deb.nodesource.com/setup_14.x | bash) \
78+
&& apt-get install -y nodejs \
79+
&& npm install -g @apidevtools/swagger-cli \
80+
&& rm -rf /var/lib/apt/lists/*
81+
7682
# Install the Rust toolchain
7783
#
7884
RUN mkdir "$TMP_BUILD_DIR" \
@@ -84,7 +90,8 @@ RUN mkdir "$TMP_BUILD_DIR" \
8490
&& cd "$TMP_BUILD_DIR" \
8591
&& cargo install cargo-kcov \
8692
&& cargo +"stable" install cargo-audit \
87-
&& cargo install --locked cargo-deny \
93+
# Fix a version that does not require cargo edition 2021.
94+
&& cargo install cargo-deny --version '^0.9.1' \
8895
&& cargo kcov --print-install-kcov-sh | sh \
8996
&& rm -rf "$CARGO_HOME/registry" \
9097
&& ln -s "$CARGO_REGISTRY_DIR" "$CARGO_HOME/registry" \

0 commit comments

Comments
 (0)