Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ jobs:
- prepare
permissions:
contents: read
outputs:
version: ${{ steps.packages.outputs.version }}
steps:
- name: install setuptools
run: |
Expand All @@ -34,6 +36,7 @@ jobs:
- uses: gardener/cc-utils/.github/actions/trusted-checkout@v1
- uses: gardener/cc-utils/.github/actions/install-gardener-gha-libs@v1
- name: create distribution packages
id: packages
run: |
set -eu

Expand All @@ -44,6 +47,7 @@ jobs:
fi

echo "version: ${version}"
echo "version=${version}" >> "${GITHUB_OUTPUT}"

# pass finalised version to setup
export ODG_CORE_LIBS_VERSION=${version}
Expand Down Expand Up @@ -276,6 +280,8 @@ jobs:
oci-platforms: linux/arm64,linux/amd64
build-ctx-artefact: distribution-packages
untar-build-ctx-artefact: distribution-packages.tar.gz
build-args: |
ODG_CORE_LIBS_VERSION=${{ needs.packages.outputs.version }}
ocm-labels: |
name: gardener.cloud/cve-categorisation
value:
Expand Down
4 changes: 3 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ COPY src/malware/clamav_entrypoint.sh /
COPY src/malware/clamd.conf /etc/clamav/clamd.conf
COPY --from=cbomkit-theia-builder /cbomkit-theia/cbomkit-theia /usr/bin/cbomkit-theia

ARG ODG_CORE_LIBS_VERSION

RUN --mount=type=bind,source=/dist,target=/dist \
apk add --no-cache \
bash \
Expand All @@ -40,7 +42,7 @@ RUN --mount=type=bind,source=/dist,target=/dist \
&& update-ca-certificates \
&& mkdir -p $HOME/.config/pip \
&& echo -e "[global]\nbreak-system-packages = true" >> $HOME/.config/pip/pip.conf \
&& pip3 install --upgrade --no-cache-dir --find-links ./dist odg-core-libs \
&& pip3 install --upgrade --no-cache-dir --find-links ./dist odg-core-libs==${ODG_CORE_LIBS_VERSION} \
&& apk del --no-cache \
libc-dev \
libffi-dev \
Expand Down
Loading