diff --git a/.github/workflows/grype_scan.yml b/.github/workflows/grype_scan.yml index ed9edeefe4b6..b6ac8e923bcd 100644 --- a/.github/workflows/grype_scan.yml +++ b/.github/workflows/grype_scan.yml @@ -50,7 +50,7 @@ jobs: sudo apt-get install -y python3-pip python3-venv python3 -m venv venv source venv/bin/activate - pip install --upgrade requests chardet urllib3 unidiff boto3 PyGithub + pip install --upgrade requests chardet urllib3 unidiff 'boto3==1.43.33' PyGithub pip install testflows==$TESTFLOWS_VERSION awscli==1.33.28 echo PATH=$PATH >>$GITHUB_ENV diff --git a/docker/server/Dockerfile.ubuntu b/docker/server/Dockerfile.ubuntu index 6c76b8dee446..4b53d942fef5 100644 --- a/docker/server/Dockerfile.ubuntu +++ b/docker/server/Dockerfile.ubuntu @@ -8,6 +8,7 @@ ARG DEBIAN_FRONTEND=noninteractive ARG apt_archive="http://archive.ubuntu.com" # We shouldn't use `apt upgrade` to not change the upstream image. It's updated biweekly +# Exception: targeted --only-upgrade for selected packages to address CVEs without a general upgrade. # user/group precreated explicitly with fixed uid/gid on purpose. # It is especially important for rootless containers: in that case entrypoint @@ -27,7 +28,17 @@ RUN sed -i "s|http://archive.ubuntu.com|${apt_archive}|g" /etc/apt/sources.list tzdata \ wget \ gpgv \ + && apt-get install --yes --no-install-recommends --only-upgrade \ + libgnutls30 \ + libssl3 \ + openssl \ + libsystemd0 \ + libudev1 \ + libgcrypt20 \ + sed \ + liblzma5 \ && busybox --install -s \ + && apt-get clean \ && rm -rf /var/lib/apt/lists/* /var/cache/debconf /tmp/* #docker-official-library:off