Skip to content

Commit 6b616b6

Browse files
authored
uv support (#1516)
* uv support Signed-off-by: Prabhu Subramanian <[email protected]> * Include uv in container images Signed-off-by: Prabhu Subramanian <[email protected]> * Perform uv sync from the root Signed-off-by: Prabhu Subramanian <[email protected]> --------- Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent 7db9896 commit 6b616b6

27 files changed

+1859
-272
lines changed

ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ RUN set -e; \
8282
&& alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
8383
&& /usr/bin/python${PYTHON_VERSION} --version \
8484
&& /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
85-
&& /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint --target /opt/pypi \
85+
&& /usr/bin/python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
8686
&& /opt/pypi/bin/poetry --version \
8787
&& /opt/pypi/bin/pipenv --version \
8888
&& /opt/pypi/bin/blint --help \

ci/Dockerfile-bun

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ RUN set -e; \
7575
&& alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
7676
&& python${PYTHON_VERSION} --version \
7777
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
78-
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint --target /opt/pypi \
78+
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
7979
&& curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \
8080
&& cargo --version \
8181
&& rustc --version \

ci/Dockerfile-deno

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ RUN set -e; \
7777
&& alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 10 \
7878
&& python${PYTHON_VERSION} --version \
7979
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
80-
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint --target /opt/pypi \
80+
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry blint uv --target /opt/pypi \
8181
&& curl -fsSL https://deno.land/x/install/install.sh | sh \
8282
&& deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write --allow-net -n cdxgen --node-modules-dir=auto "npm:@cyclonedx/cdxgen/cdxgen" \
8383
&& deno install -g --allow-read --allow-env --allow-run --allow-sys=uid,systemMemoryInfo,gid,homedir --allow-write -n atom "npm:@appthreat/atom/atom" \

ci/Dockerfile-ppc64

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ RUN set -e; \
6767
&& cargo --version \
6868
&& rustc --version \
6969
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pip virtualenv \
70-
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry --target /opt/pypi \
70+
&& python${PYTHON_VERSION} -m pip install --no-cache-dir --upgrade pipenv poetry uv --target /opt/pypi \
7171
&& curl -s "https://get.sdkman.io" | bash \
7272
&& echo -e "sdkman_auto_answer=true\nsdkman_selfupdate_feature=false\nsdkman_auto_env=true" >> $HOME/.sdkman/etc/config \
7373
&& source "$HOME/.sdkman/bin/sdkman-init.sh" \

ci/base-images/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -it mcr.microsoft.com/dot
146146
Old .Net framework applications (<= 4.7) are well known for their dislike of linux and hence may not restore/build easily. To troubleshoot, try running the `nuget restore` command manually using the `bci-dotnet` image as shown.
147147

148148
```shell
149-
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -it ghcr.io/cyclonedx/bci-dotnet:main nuget restore -Verbosity detailed /app/<solution file name>
149+
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -it ghcr.io/cyclonedx/bci-dotnet:master nuget restore -Verbosity detailed /app/<solution file name>
150150
```
151151

152152
If you see any mono-related crashes, there isn't a lot that can be done other than using the correct version of Windows for the restore step.
@@ -156,7 +156,7 @@ If you see any mono-related crashes, there isn't a lot that can be done other th
156156
Assemblies that are present in the Global Assembly Cache can be referred to and used directly without specifying a version number. This style of includes is common with namespaces such as `System.`, `Microsoft.`, and `Mono.`. Use the command `gacutil -l` to [obtain](https://learn.microsoft.com/en-us/dotnet/framework/app-domains/how-to-view-the-contents-of-the-gac#view-the-assemblies-in-the-gac) the version details for libraries from GAC.
157157

158158
```shell
159-
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -it ghcr.io/cyclonedx/bci-dotnet:main gacutil -l
159+
docker run --rm -v /tmp:/tmp -v $(pwd):/app:rw -w /app -it ghcr.io/cyclonedx/bci-dotnet:master gacutil -l
160160
```
161161

162162
Sample output:

ci/base-images/cdxgen/Dockerfile.python

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ RUN source /root/.nvm/nvm.sh \
2828
&& zypper --non-interactive install -l --no-recommends clang7 llvm7 llvm7-devel libcurl-devel libjpeg62-devel libmariadb-devel \
2929
postgresql-devel postgresql16-server-devel libopenssl-devel libopenblas_pthreads-devel lapacke-devel \
3030
&& python3 -m pip install --no-cache-dir --upgrade pip virtualenv \
31-
&& python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry blint \
31+
&& python3 -m pip install --no-cache-dir --upgrade --user pipenv poetry blint uv \
3232
&& npm install -g @cyclonedx/cdxgen --omit=dev \
3333
&& zypper clean -a
3434

ci/base-images/opensuse/Dockerfile.lang

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ RUN set -e; \
6060
&& rm dotnet.tar.gz \
6161
&& dotnet --list-sdks \
6262
&& mkdir /opt/pypi \
63-
&& python -m pip install --no-cache-dir --upgrade poetry pipenv blint custom-json-diff --target /opt/pypi \
63+
&& python -m pip install --no-cache-dir --upgrade poetry pipenv blint custom-json-diff uv --target /opt/pypi \
6464
&& node -v \
6565
&& npm -v \
6666
&& poetry --version \

ci/base-images/opensuse/Dockerfile.python310

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ RUN set -e; \
3232
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.10 10 \
3333
&& mkdir /opt/pypi \
3434
&& python -m pip install --no-cache-dir --upgrade pip virtualenv \
35-
&& python -m pip install --no-cache-dir --upgrade poetry pipenv --target /opt/pypi \
35+
&& python -m pip install --no-cache-dir --upgrade poetry pipenv uv --target /opt/pypi \
3636
&& npm install -g npm \
3737
&& npm install -g node-gyp \
3838
&& npx node-gyp install \

ci/base-images/opensuse/Dockerfile.python39

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ RUN set -e; \
3131
&& update-alternatives --install /usr/bin/python3 python3 /usr/bin/python3.9 10 \
3232
&& mkdir /opt/pypi \
3333
&& python -m pip install --no-cache-dir --upgrade pip virtualenv \
34-
&& python -m pip install --no-cache-dir --upgrade poetry pipenv --target /opt/pypi \
34+
&& python -m pip install --no-cache-dir --upgrade poetry pipenv uv --target /opt/pypi \
3535
&& npm install -g npm \
3636
&& node -v \
3737
&& npm -v \

ci/base-images/sle/Dockerfile.python311

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ RUN set -e; \
4545
&& mv /root/.sdkman/candidates/* /opt/ \
4646
&& rm -rf /root/.sdkman \
4747
&& python3 -m pip install --no-cache-dir --upgrade pip virtualenv \
48-
&& python3 -m pip install --no-cache-dir --upgrade pipenv poetry --target /opt/pypi \
48+
&& python3 -m pip install --no-cache-dir --upgrade pipenv poetry uv --target /opt/pypi \
4949
&& curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash \
5050
&& source /root/.nvm/nvm.sh \
5151
&& nvm install ${NODE_VERSION} \

0 commit comments

Comments
 (0)