Skip to content

Commit 32e28a4

Browse files
malice00malice00
authored
[build] Fixed docker warnings about using undefined variables (#1846)
Fixed docker warnings about using undefined variables Also removed duplicate definitions and replaced literals with the vars Signed-off-by: Roland Asmann <[email protected]>
1 parent cc62247 commit 32e28a4

40 files changed

+155
-170
lines changed

‎ci/Dockerfile‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,13 @@ ENV GOPATH=/opt/app-root/go \
5656
TMPDIR=/tmp \
5757
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
5858
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
59-
PYTHONPATH=/opt/pypi:${PYTHONPATH} \
59+
PYTHONPATH=/opt/pypi \
6060
CDXGEN_IN_CONTAINER=true \
6161
CDXGEN_TEMP_DIR=/tmp/cdxgen-temp \
6262
SDKMAN_DIR=/opt/.sdkman \
6363
SDKMAN_CANDIDATES_DIR=/opt/.sdkman/candidates \
6464
RBENV_ROOT=/opt/.rbenv
65-
ENV PATH=${PATH}:/opt/bin:/opt/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SCALA_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/opt/.local/bin:/opt/pypi/bin:/opt/.rbenv/bin:/opt/.rbenv/versions/3.4.4/bin:
65+
ENV PATH=${PATH}:/opt/bin:/opt/.nvm/versions/node/v${NODE_VERSION}/bin:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SCALA_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/opt/.local/bin:${PYTHONPATH}/bin:/opt/.rbenv/bin:/opt/.rbenv/versions/3.4.4/bin:
6666

6767
COPY . /opt/cdxgen
6868

@@ -89,9 +89,9 @@ RUN set -e; \
8989
&& /usr/bin/python3 --version \
9090
&& /usr/bin/python3 -m pip install --no-cache-dir --upgrade setuptools==77.0.3 wheel pip virtualenv \
9191
&& /usr/bin/python3 -m pip install --no-cache-dir --upgrade pipenv poetry blint atom-tools uv --target /opt/pypi \
92-
&& /opt/pypi/bin/poetry --version \
93-
&& /opt/pypi/bin/pipenv --version \
94-
&& /opt/pypi/bin/blint --help \
92+
&& ${PYTHONPATH}/bin/poetry --version \
93+
&& ${PYTHONPATH}/bin/pipenv --version \
94+
&& ${PYTHONPATH}/bin/blint --help \
9595
&& mkdir -p /opt/bin /opt/.nvm /tmp/cdxgen-temp \
9696
&& cargo --version \
9797
&& rustc --version \
@@ -149,8 +149,8 @@ RUN set -e; \
149149
&& cd /opt/cdxgen && corepack enable pnpm && pnpm config set global-bin-dir /opt/bin \
150150
&& pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && pnpm link && pnpm cache delete \
151151
&& pnpm bin && pnpm bin -g \
152-
&& mkdir -p /opt/cdxgen-node-cache \
153-
&& chown -R cyclonedx:cyclonedx /opt/cdxgen /opt/cdxgen-node-cache \
152+
&& mkdir -p ${NODE_COMPILE_CACHE} \
153+
&& chown -R cyclonedx:cyclonedx /opt/cdxgen ${NODE_COMPILE_CACHE} \
154154
&& chmod a-w -R /opt \
155155
&& rm -rf /var/cache/yum /root/.cache/pypoetry /root/.cache/node \
156156
&& microdnf clean all

‎ci/Dockerfile-bun‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ ENV GOPATH=/opt/app-root/go \
5151
CDXGEN_IN_CONTAINER=true \
5252
SDKMAN_DIR=/root/.sdkman \
5353
SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \
54-
PYTHONPATH=/opt/pypi:${PYTHONPATH}
55-
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/root/.bun/bin:/root/.cargo/bin:/opt/pypi/bin:
54+
PYTHONPATH=/opt/pypi
55+
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/root/.bun/bin:/root/.cargo/bin:${PYTHONPATH}/bin:
5656

5757
RUN set -e; \
5858
ARCH_NAME="$(rpm --eval '%{_arch}')"; \

‎ci/Dockerfile-deno‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ ENV GOPATH=/opt/app-root/go \
5757
CDXGEN_IN_CONTAINER=true \
5858
SDKMAN_DIR=/root/.sdkman \
5959
SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \
60-
PYTHONPATH=/opt/pypi:${PYTHONPATH} \
60+
PYTHONPATH=/opt/pypi \
6161
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
6262
RBENV_ROOT=/opt/.rbenv
63-
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SCALA_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/root/.deno/bin:/root/.cargo/bin:/opt/pypi/bin:/opt/.rbenv/bin:/opt/.rbenv/versions/3.4.4/bin:
63+
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SCALA_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/root/.deno/bin:/root/.cargo/bin:${PYTHONPATH}/bin:/opt/.rbenv/bin:/opt/.rbenv/versions/3.4.4/bin:
6464

6565
RUN set -e; \
6666
ARCH_NAME="$(rpm --eval '%{_arch}')"; \

‎ci/Dockerfile-ppc64‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ ENV GOPATH=/opt/app-root/go \
3434
SDKMAN_DIR=/root/.sdkman \
3535
DOTNET_CLI_TELEMETRY_OPTOUT=1 \
3636
SDKMAN_CANDIDATES_DIR=/root/.sdkman/candidates \
37-
PYTHONPATH=/opt/pypi:${PYTHONPATH}
38-
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/${HOME}/.cargo/bin:/opt/pypi/bin:
37+
PYTHONPATH=/opt/pypi
38+
ENV PATH=${PATH}:${JAVA_HOME}/bin:${MAVEN_HOME}/bin:${GRADLE_HOME}/bin:${SBT_HOME}/bin:${GOPATH}/bin:/usr/local/go/bin:/usr/local/bin/:/root/.local/bin:/${HOME}/.cargo/bin:${PYTHONPATH}/bin:
3939

4040
RUN set -e; \
4141
ARCH_NAME="$(rpm --eval '%{_arch}')"; \

‎ci/images/Dockerfile.dotnet7‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ LABEL maintainer="CycloneDX" \
3434

3535
ENV CDXGEN_IN_CONTAINER=true \
3636
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
37-
PYTHONPATH=/opt/pypi:${PYTHONPATH} \
37+
PYTHONPATH=/opt/pypi \
3838
DOSAI_CMD=/usr/local/bin/dosai
39-
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
39+
ENV PATH=${PATH}:/usr/local/bin:${PYTHONPATH}/bin:/opt/cdxgen/node_modules/.bin:
4040

4141
COPY . /opt/cdxgen
4242

@@ -59,7 +59,7 @@ RUN set -e; \
5959
&& curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai${DOSAI_ARCH_SUFFIX} -o /usr/local/bin/dosai \
6060
&& chmod +x /usr/local/bin/dosai \
6161
&& dosai --help \
62-
&& mkdir -p /opt/cdxgen-node-cache \
62+
&& mkdir -p ${NODE_COMPILE_CACHE} \
6363
&& node /opt/cdxgen/bin/cdxgen.js --help \
6464
&& pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
6565
&& rm -rf /root/.cache/node \

‎ci/images/Dockerfile.dotnet8‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ LABEL maintainer="CycloneDX" \
3434

3535
ENV CDXGEN_IN_CONTAINER=true \
3636
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
37-
PYTHONPATH=/opt/pypi:${PYTHONPATH} \
37+
PYTHONPATH=/opt/pypi \
3838
DOSAI_CMD=/usr/local/bin/dosai
39-
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
39+
ENV PATH=${PATH}:/usr/local/bin:${PYTHONPATH}/bin:/opt/cdxgen/node_modules/.bin:
4040

4141
COPY . /opt/cdxgen
4242

@@ -59,7 +59,7 @@ RUN set -e; \
5959
&& curl -L https://github.com/owasp-dep-scan/dosai/releases/latest/download/Dosai${DOSAI_ARCH_SUFFIX} -o /usr/local/bin/dosai \
6060
&& chmod +x /usr/local/bin/dosai \
6161
&& dosai --help \
62-
&& mkdir -p /opt/cdxgen-node-cache \
62+
&& mkdir -p ${NODE_COMPILE_CACHE} \
6363
&& node /opt/cdxgen/bin/cdxgen.js --help \
6464
&& pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
6565
&& rm -rf /root/.cache/node \

‎ci/images/Dockerfile.dotnet9‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ LABEL maintainer="CycloneDX" \
3434

3535
ENV CDXGEN_IN_CONTAINER=true \
3636
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
37-
PYTHONPATH=/opt/pypi:${PYTHONPATH}
38-
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
37+
PYTHONPATH=/opt/pypi
38+
ENV PATH=${PATH}:/usr/local/bin:${PYTHONPATH}/bin:/opt/cdxgen/node_modules/.bin:
3939

4040
COPY . /opt/cdxgen
4141

4242
RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
43-
&& mkdir -p /opt/cdxgen-node-cache \
43+
&& mkdir -p ${NODE_COMPILE_CACHE} \
4444
&& node /opt/cdxgen/bin/cdxgen.js --help \
4545
&& pip install --upgrade --no-cache-dir blint atom-tools --target /opt/pypi \
4646
&& rm -rf /root/.cache/node \

‎ci/images/Dockerfile.java11‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:
7272
COPY . /opt/cdxgen
7373

7474
RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
75-
&& mkdir -p /opt/cdxgen-node-cache \
75+
&& mkdir -p ${NODE_COMPILE_CACHE} \
7676
&& node /opt/cdxgen/bin/cdxgen.js --help \
7777
&& rm -rf /root/.cache/node \
7878
&& chmod a-w -R /opt

‎ci/images/Dockerfile.java17‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@ LABEL maintainer="CycloneDX" \
7474
org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-java17:v11 -r /app --server"
7575

7676
ENV CDXGEN_IN_CONTAINER=true \
77-
PYTHONPATH=/opt/pypi:${PYTHONPATH} \
77+
PYTHONPATH=/opt/pypi \
7878
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
79-
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:/opt/pypi/bin:
79+
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:${PYTHONPATH}/bin:
8080

8181
COPY . /opt/cdxgen
8282

@@ -95,7 +95,7 @@ RUN set -e; \
9595
*) echo >&2 "error: unsupported architecture: '$ARCH_NAME'"; exit 1 ;; \
9696
esac \
9797
&& cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
98-
&& mkdir -p /opt/cdxgen-node-cache \
98+
&& mkdir -p ${NODE_COMPILE_CACHE} \
9999
&& node /opt/cdxgen/bin/cdxgen.js --help \
100100
&& pip install --upgrade --no-cache-dir atom-tools --target /opt/pypi \
101101
&& atom-tools --help \

‎ci/images/Dockerfile.java17-slim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:
7171
COPY . /opt/cdxgen
7272

7373
RUN cd /opt/cdxgen && corepack enable && corepack pnpm install --config.strict-dep-builds=true --prod --package-import-method copy --frozen-lockfile && corepack pnpm cache delete \
74-
&& mkdir -p /opt/cdxgen-node-cache \
74+
&& mkdir -p ${NODE_COMPILE_CACHE} \
7575
&& node /opt/cdxgen/bin/cdxgen.js --help \
7676
&& rm -rf /root/.cache/node \
7777
&& chmod a-w -R /opt

0 commit comments

Comments
 (0)