Skip to content

Commit e08946b

Browse files
malice00malice00
committed
Removed using nexus for python -- doesn't work on all images yet
Signed-off-by: Roland Asmann <[email protected]>
1 parent 407e8a0 commit e08946b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+166
-528
lines changed

‎.github/actions/generate-attach-sbom/action.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ inputs:
1212
platform:
1313
description: The platforms for which to build the image
1414
required: true
15-
signing-key:
16-
description: The key to use for signing the SBOM, base64 encoded
17-
required: true
1815
tag:
1916
description: All tags for the image
2017
required: true
18+
signing-key:
19+
description: The key to use for signing the SBOM, base64 encoded
20+
required: true
2121
target:
2222
description: Which stage in the Dockerfile to build
2323
required: true

‎.github/workflows/image-build.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,9 @@ on:
1818
type: boolean
1919

2020
env:
21-
NEXUS_NPM_REPO_PATH: /repository/npm
2221
NEXUS_PORT: 8081
23-
NEXUS_PYPI_REPO_PATH: /repository/pypi
2422
NEXUS_SERVER: 100.73.146.80
23+
NEXUS_NPM_REPO_PATH: /repository/npm
2524
REPO: ghcr.io
2625
TAG: v11
2726
TEAM: cyclonedx
@@ -69,7 +68,6 @@ jobs:
6968
cat >> "$GITHUB_OUTPUT" << EOF
7069
docker-args<<VALUE
7170
"NPM_REPO=$NPM_REPO"
72-
"PIP_CONFIG=[global]\nindex-url=http://$NEXUS_SERVER:$NEXUS_PORT$NEXUS_PYPI_REPO_PATH/simple\ntrusted-host=$NEXUS_SERVER"
7371
VALUE
7472
EOF
7573
- name: Install project dependencies

‎ci/images/Dockerfile.dotnet7‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM registry.suse.com/bci/dotnet-sdk:7.0 AS base
33

44
ARG NPM_REPO
5-
ARG PIP_CONFIG
65

76
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 \
87
DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
@@ -18,12 +17,8 @@ RUN set -e; \
1817
if [ -n "$NPM_REPO" ]; then \
1918
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2019
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
21-
fi; \
22-
if [ -n "$PIP_CONFIG" ]; then \
23-
mkdir $HOME/.pip/; \
24-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
25-
fi; \
26-
zypper refresh \
20+
fi \
21+
&& zypper refresh \
2722
&& zypper \
2823
--non-interactive \
2924
update \
@@ -72,12 +67,8 @@ RUN set -e; \
7267
if [ -n "$NPM_REPO" ]; then \
7368
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
7469
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
75-
fi; \
76-
if [ -n "$PIP_CONFIG" ]; then \
77-
mkdir $HOME/.pip/; \
78-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
79-
fi; \
80-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
70+
fi \
71+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
8172
case "${ARCH_NAME##*-}" in \
8273
'amd64' | 'x86_64') \
8374
DOSAI_ARCH_SUFFIX='-full'; \

‎ci/images/Dockerfile.dotnet8‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM registry.suse.com/bci/dotnet-sdk:8.0 AS base
33

44
ARG NPM_REPO
5-
ARG PIP_CONFIG
65

76
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 \
87
DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
@@ -18,12 +17,8 @@ RUN set -e; \
1817
if [ -n "$NPM_REPO" ]; then \
1918
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2019
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
21-
fi; \
22-
if [ -n "$PIP_CONFIG" ]; then \
23-
mkdir $HOME/.pip/; \
24-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
25-
fi; \
26-
zypper refresh \
20+
fi \
21+
&& zypper refresh \
2722
&& zypper \
2823
--non-interactive \
2924
update \
@@ -73,12 +68,8 @@ RUN set -e; \
7368
if [ -n "$NPM_REPO" ]; then \
7469
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
7570
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
76-
fi; \
77-
if [ -n "$PIP_CONFIG" ]; then \
78-
mkdir $HOME/.pip/; \
79-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
80-
fi; \
81-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
71+
fi \
72+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
8273
case "${ARCH_NAME##*-}" in \
8374
'amd64' | 'x86_64') \
8475
DOSAI_ARCH_SUFFIX='-full'; \

‎ci/images/Dockerfile.dotnet9‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
FROM registry.suse.com/bci/dotnet-sdk:9.0 AS base
33

44
ARG NPM_REPO
5-
ARG PIP_CONFIG
65

76
ENV DOTNET_CLI_TELEMETRY_OPTOUT=1 \
87
DOTNET_GENERATE_ASPNET_CERTIFICATE=false \
@@ -18,12 +17,8 @@ RUN set -e; \
1817
if [ -n "$NPM_REPO" ]; then \
1918
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2019
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
21-
fi; \
22-
if [ -n "$PIP_CONFIG" ]; then \
23-
mkdir $HOME/.pip/; \
24-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
25-
fi; \
26-
zypper refresh \
20+
fi \
21+
&& zypper refresh \
2722
&& zypper \
2823
--non-interactive \
2924
update \
@@ -72,12 +67,8 @@ RUN set -e; \
7267
if [ -n "$NPM_REPO" ]; then \
7368
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
7469
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
75-
fi; \
76-
if [ -n "$PIP_CONFIG" ]; then \
77-
mkdir $HOME/.pip/; \
78-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
79-
fi; \
80-
cd /opt/cdxgen \
70+
fi \
71+
&& cd /opt/cdxgen \
8172
&& corepack enable \
8273
&& corepack pnpm install \
8374
--config.strict-dep-builds=true \

‎ci/images/Dockerfile.java11‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM registry.suse.com/bci/openjdk-devel:11 AS base
44
ARG GRADLE_VERSION=7.6.4
55
ARG MAVEN_VERSION=3.6.3
66
ARG NPM_REPO
7-
ARG PIP_CONFIG
87
ARG SBT_VERSION=1.8.3
98

109
ENV GRADLE_HOME="/opt/gradle/${GRADLE_VERSION}" \
@@ -25,12 +24,8 @@ RUN set -e; \
2524
if [ -n "$NPM_REPO" ]; then \
2625
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2726
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
28-
fi; \
29-
if [ -n "$PIP_CONFIG" ]; then \
30-
mkdir $HOME/.pip/; \
31-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
32-
fi; \
33-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
27+
fi \
28+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
3429
case "${ARCH_NAME##*-}" in \
3530
'amd64' | 'x86_64') \
3631
GOBIN_VERSION='amd64'; \
@@ -96,12 +91,8 @@ RUN set -e; \
9691
if [ -n "$NPM_REPO" ]; then \
9792
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
9893
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
99-
fi; \
100-
if [ -n "$PIP_CONFIG" ]; then \
101-
mkdir $HOME/.pip/; \
102-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
103-
fi; \
104-
cd /opt/cdxgen \
94+
fi \
95+
&& cd /opt/cdxgen \
10596
&& corepack enable \
10697
&& corepack pnpm install \
10798
--config.strict-dep-builds=true \

‎ci/images/Dockerfile.java17‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM registry.suse.com/bci/openjdk-devel:17 AS base
44
ARG GRADLE_VERSION=8.14.2
55
ARG MAVEN_VERSION=3.9.10
66
ARG NPM_REPO
7-
ARG PIP_CONFIG
87
ARG SBT_VERSION=1.11.2
98
ARG SCALA_VERSION=3.6.4
109

@@ -28,12 +27,8 @@ RUN set -e; \
2827
if [ -n "$NPM_REPO" ]; then \
2928
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
3029
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
31-
fi; \
32-
if [ -n "$PIP_CONFIG" ]; then \
33-
mkdir $HOME/.pip/; \
34-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
35-
fi; \
36-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
30+
fi \
31+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
3732
case "${ARCH_NAME##*-}" in \
3833
'amd64' | 'x86_64') \
3934
GOBIN_VERSION='amd64'; \
@@ -106,12 +101,8 @@ RUN set -e; \
106101
if [ -n "$NPM_REPO" ]; then \
107102
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
108103
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
109-
fi; \
110-
if [ -n "$PIP_CONFIG" ]; then \
111-
mkdir $HOME/.pip/; \
112-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
113-
fi; \
114-
cd /opt/cdxgen \
104+
fi \
105+
&& cd /opt/cdxgen \
115106
&& corepack enable \
116107
&& corepack pnpm install \
117108
--config.strict-dep-builds=true \

‎ci/images/Dockerfile.java17-slim‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM registry.suse.com/bci/openjdk-devel:17 AS base
44
ARG GRADLE_VERSION=8.14.2
55
ARG MAVEN_VERSION=3.9.10
66
ARG NPM_REPO
7-
ARG PIP_CONFIG
87
ARG SBT_VERSION=1.11.2
98

109
ENV GRADLE_HOME="/opt/gradle/${GRADLE_VERSION}" \
@@ -24,12 +23,8 @@ RUN set -e; \
2423
if [ -n "$NPM_REPO" ]; then \
2524
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2625
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
27-
fi; \
28-
if [ -n "$PIP_CONFIG" ]; then \
29-
mkdir $HOME/.pip/; \
30-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
31-
fi; \
32-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
26+
fi \
27+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
3328
case "${ARCH_NAME##*-}" in \
3429
'amd64' | 'x86_64') \
3530
GOBIN_VERSION='amd64'; \
@@ -95,12 +90,8 @@ RUN set -e; \
9590
if [ -n "$NPM_REPO" ]; then \
9691
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
9792
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
98-
fi; \
99-
if [ -n "$PIP_CONFIG" ]; then \
100-
mkdir $HOME/.pip/; \
101-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
102-
fi; \
103-
cd /opt/cdxgen \
93+
fi \
94+
&& cd /opt/cdxgen \
10495
&& corepack enable \
10596
&& corepack pnpm install \
10697
--config.strict-dep-builds=true \

‎ci/images/Dockerfile.node20‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ FROM registry.suse.com/bci/nodejs:20 AS base
33

44
ARG GCC_VERSION=14
55
ARG NPM_REPO
6-
ARG PIP_CONFIG
76

87
ENV LANG=en_US.UTF-8 \
98
LANGUAGE=en_US.UTF-8 \
@@ -17,12 +16,8 @@ RUN set -e; \
1716
if [ -n "$NPM_REPO" ]; then \
1817
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
1918
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
20-
fi; \
21-
if [ -n "$PIP_CONFIG" ]; then \
22-
mkdir $HOME/.pip/; \
23-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
24-
fi; \
25-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
19+
fi \
20+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
2621
case "${ARCH_NAME##*-}" in \
2722
'amd64' | 'x86_64') \
2823
GOBIN_VERSION='amd64'; \
@@ -102,12 +97,8 @@ RUN set -e; \
10297
if [ -n "$NPM_REPO" ]; then \
10398
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
10499
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
105-
fi; \
106-
if [ -n "$PIP_CONFIG" ]; then \
107-
mkdir $HOME/.pip/; \
108-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
109-
fi; \
110-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
100+
fi \
101+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
111102
case "${ARCH_NAME##*-}" in \
112103
'amd64' | 'x86_64') \
113104
ATOM_ARCH_SUFFIX='amd64'; \

‎ci/images/Dockerfile.python311‎

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ ARG MAVEN_VERSION=3.9.10
88
# renovate: datasource=docker depName=node
99
ARG NODE_VERSION=20.19.3
1010
ARG NPM_REPO
11-
ARG PIP_CONFIG
1211

1312
ENV GOPATH=/opt/app-root/go \
1413
JAVA_HOME="/opt/java/${JAVA_VERSION}" \
@@ -27,12 +26,8 @@ RUN set -e; \
2726
if [ -n "$NPM_REPO" ]; then \
2827
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
2928
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
30-
fi; \
31-
if [ -n "$PIP_CONFIG" ]; then \
32-
mkdir $HOME/.pip/; \
33-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
34-
fi; \
35-
ARCH_NAME="$(rpm --eval '%{_arch}')"; \
29+
fi \
30+
&& ARCH_NAME="$(rpm --eval '%{_arch}')"; \
3631
case "${ARCH_NAME##*-}" in \
3732
'amd64' | 'x86_64') \
3833
GOBIN_VERSION='amd64'; \
@@ -136,12 +131,8 @@ RUN set -e; \
136131
if [ -n "$NPM_REPO" ]; then \
137132
export COREPACK_NPM_REGISTRY=$NPM_REPO; \
138133
echo -e "registry=$NPM_REPO\n@jsr:registry=$NPM_REPO" > $HOME/.npmrc; \
139-
fi; \
140-
if [ -n "$PIP_CONFIG" ]; then \
141-
mkdir $HOME/.pip/; \
142-
echo -e "$PIP_CONFIG" > $HOME/.pip/pip.conf; \
143-
fi; \
144-
source ${NVM_DIR}/nvm.sh \
134+
fi \
135+
&& source ${NVM_DIR}/nvm.sh \
145136
&& zypper \
146137
--non-interactive \
147138
install \

0 commit comments

Comments
 (0)