Skip to content

Commit

Permalink
Bundle locally built cli in the container images
Browse files Browse the repository at this point in the history 
Signed-off-by: Prabhu Subramanian <[email protected]>
  • Loading branch information
@prabhu
prabhu committed Jan 6, 2025
1 parent 6889358 commit 246556a
Show file tree
Hide file tree
Showing 18 changed files with 33 additions and 1 deletion.
1 change: 1 addition & 0 deletions ci/base-images/debian/Dockerfile.dotnet6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ COPY ci/base-images/debian/install.sh /tmp/

RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \
&& apt-get install -y build-essential mono-devel mono-xbuild nuget python3 python3-pip python3-dev \
&& useradd -ms /bin/bash cyclonedx \
&& chmod +x /tmp/install.sh \
&& ./tmp/install.sh && rm /tmp/install.sh \
&& node -v \
Expand Down
1 change: 1 addition & 0 deletions ci/base-images/debian/Dockerfile.dotnet8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ COPY ci/base-images/debian/install.sh /tmp/

RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \
&& apt-get install -y build-essential python3 python3-pip python3-dev \
&& useradd -ms /bin/bash cyclonedx \
&& chmod +x /tmp/install.sh \
&& ./tmp/install.sh && rm /tmp/install.sh \
&& node -v \
Expand Down
1 change: 1 addition & 0 deletions ci/base-images/debian/Dockerfile.dotnet9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ COPY ci/base-images/debian/install.sh /tmp/

RUN apt-get update && apt-get install -y --no-install-recommends curl bash bzip2 git-core zip unzip make gawk \
&& apt-get install -y build-essential python3 python3-pip python3-dev \
&& useradd -ms /bin/bash cyclonedx \
&& chmod +x /tmp/install.sh \
&& ./tmp/install.sh && rm /tmp/install.sh \
&& node -v \
Expand Down
2 changes: 2 additions & 0 deletions ci/base-images/opensuse/Dockerfile.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,15 @@ RUN set -e; \
&& python -m pip install --no-cache-dir --upgrade poetry pipenv blint custom-json-diff uv --target /opt/pypi \
&& node -v \
&& npm -v \
&& npm install -g corepack \
&& poetry --version \
&& pipenv --version \
&& blint --help \
&& gcc --version \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
3 changes: 2 additions & 1 deletion ci/base-images/opensuse/Dockerfile.python310
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN set -e; \
&& python -m pip install --no-cache-dir --upgrade pip virtualenv \
&& python -m pip install --no-cache-dir --upgrade poetry pipenv uv --target /opt/pypi \
&& npm install -g npm \
&& npm install -g node-gyp \
&& npm install -g node-gyp corepack \
&& npx node-gyp install \
&& node -v \
&& npm -v \
Expand All @@ -44,6 +44,7 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/opensuse/Dockerfile.python39
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ RUN set -e; \
&& npm install -g npm \
&& node -v \
&& npm -v \
&& npm install -g corepack \
&& poetry --version \
&& pipenv --version \
&& gcc --version \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.dotnet6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ RUN zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20
&& chmod +x /usr/bin/nuget \
&& rm -rf /usr/lib/mono/nuget \
&& dotnet --list-sdks \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a
COPY ci/base-images/nuget /usr/lib/mono/nuget
CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.dotnet7
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ RUN zypper refresh && zypper --non-interactive update && zypper --non-interactiv
&& sdk offline enable \
&& mv /root/.sdkman/candidates/* /opt/ \
&& rm -rf /root/.sdkman \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.dotnet8
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \

RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk java-21-openjdk-devel \
&& dotnet --list-sdks \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.dotnet9
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ ENV DOTNET_GENERATE_ASPNET_CERTIFICATE=false \

RUN zypper refresh && zypper --non-interactive update && zypper --non-interactive install -l --no-recommends git-core nodejs20 npm20 python311 python311-pip wget zip unzip make gawk java-21-openjdk-devel \
&& dotnet --list-sdks \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.java-slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.java17
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.java17-slim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.lang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.node20
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.python311
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash
2 changes: 2 additions & 0 deletions ci/base-images/sle/Dockerfile.python36
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ RUN set -e; \
&& curl -L --output /usr/bin/bazel https://github.com/bazelbuild/bazelisk/releases/latest/download/bazelisk-linux-${GOBIN_VERSION} \
&& chmod +x /usr/bin/bazel \
&& bazel --version \
&& npm install -g corepack \
&& useradd -ms /bin/bash cyclonedx \
&& zypper clean -a

CMD /bin/bash

0 comments on commit 246556a

Please sign in to comment.