Skip to content

Commit 4ea9b10

Browse files
committed
Skip installing blint on alpine images
Signed-off-by: Prabhu Subramanian <[email protected]>
1 parent 4b8dce9 commit 4ea9b10

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

ci/base-images/cdxgen/alpine/Dockerfile.golang123

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ LABEL maintainer="CycloneDX" \
1212
org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-alpine-golang123:v11 -r /app --server"
1313

1414
ENV CDXGEN_IN_CONTAINER=true \
15-
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
16-
PYTHONPATH=/opt/pypi:${PYTHONPATH}
17-
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
15+
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
16+
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:
1817

1918
COPY . /opt/cdxgen
2019

2120
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 \
2221
&& mkdir -p /opt/cdxgen-node-cache \
2322
&& node /opt/cdxgen/bin/cdxgen.js --help \
24-
&& pip install --upgrade --no-cache-dir blint --target /opt/pypi \
2523
&& rm -rf /root/.cache/node \
2624
&& chmod a-w -R /opt
2725
WORKDIR /app

ci/base-images/cdxgen/alpine/Dockerfile.golang124

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,14 @@ LABEL maintainer="CycloneDX" \
1212
org.opencontainers.docker.cmd="docker run --rm -v /tmp:/tmp -p 9090:9090 -v $(pwd):/app:rw -t ghcr.io/cyclonedx/cdxgen-alpine-golang124:v11 -r /app --server"
1313

1414
ENV CDXGEN_IN_CONTAINER=true \
15-
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache" \
16-
PYTHONPATH=/opt/pypi:${PYTHONPATH}
17-
ENV PATH=${PATH}:/usr/local/bin:/opt/pypi/bin:/opt/cdxgen/node_modules/.bin:
15+
NODE_COMPILE_CACHE="/opt/cdxgen-node-cache"
16+
ENV PATH=${PATH}:/usr/local/bin:/opt/cdxgen/node_modules/.bin:
1817

1918
COPY . /opt/cdxgen
2019

2120
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 \
2221
&& mkdir -p /opt/cdxgen-node-cache \
2322
&& node /opt/cdxgen/bin/cdxgen.js --help \
24-
&& pip install --upgrade --no-cache-dir blint --target /opt/pypi \
2523
&& rm -rf /root/.cache/node \
2624
&& chmod a-w -R /opt
2725
WORKDIR /app

0 commit comments

Comments
 (0)