diff --git a/.gitignore b/.gitignore index 20494bd..623900b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ tmp/* venv -package-list +package-list* diff --git a/Containerfile.apt-source b/Containerfile.apt-source index 9ca1af4..3437643 100644 --- a/Containerfile.apt-source +++ b/Containerfile.apt-source @@ -12,7 +12,9 @@ RUN apt-get update \ -o Dir::Etc::sourcelist="/usr/local/src/conf/ingest-debsrc/gardenlinux.sources" \ -o Dir::State="/usr/local/src/data/ingest-debsrc/gardenlinux/" -RUN find /usr/local/src/data/ingest-debsrc/gardenlinux/ -name packages.gardenlinux.io_gardenlinux_dists*source_Sources* +WORKDIR /usr/local/src/data/ingest-debsrc/gardenlinux/lists/ + +RUN find . -name "packages.gardenlinux.io_gardenlinux_dists*source_Sources*" ENTRYPOINT ["lz4", "-dc"] -CMD ["/usr/local/src/data/ingest-debsrc/gardenlinux/lists/packages.gardenlinux.io_gardenlinux_dists_today_main_source_Sources.lz4"] +CMD ["packages.gardenlinux.io_gardenlinux_dists_today_main_source_Sources.lz4"] diff --git a/conf/ingest-debsrc/gardenlinux.sources b/conf/ingest-debsrc/gardenlinux.sources index 098e90f..05c4e0b 100644 --- a/conf/ingest-debsrc/gardenlinux.sources +++ b/conf/ingest-debsrc/gardenlinux.sources @@ -1,6 +1,6 @@ Enabled: yes Types: deb-src URIs: https://packages.gardenlinux.io/gardenlinux -Suites: today +Suites: today 1592.4 Components: main Signed-By: /etc/apt/trusted.gpg.d/keyring.asc diff --git a/ingest-postgres.sh b/ingest-postgres.sh index 6118be0..c052c6e 100755 --- a/ingest-postgres.sh +++ b/ingest-postgres.sh @@ -40,6 +40,9 @@ python3 -m glvd.cli.data.ingest_debsec debian security-tracker/data echo "Run data ingestion (ingest-debsrc - gardenlinux today)" python3 -m glvd.cli.data.ingest_debsrc gardenlinux today /usr/local/src/data/ingest-debsrc/gardenlinux/lists/packages.gardenlinux.io_gardenlinux_dists_today_main_source_Sources +echo "Run data ingestion (ingest-debsrc - gardenlinux 1592)" +python3 -m glvd.cli.data.ingest_debsrc gardenlinux 1592 /usr/local/src/data/ingest-debsrc/gardenlinux/lists/packages.gardenlinux.io_gardenlinux_dists_1592.4_main_source_Sources + echo "Run data ingestion (nvd)" echo date before nvd diff --git a/src/glvd/data/dist_cpe.py b/src/glvd/data/dist_cpe.py index e899e72..975ab2b 100644 --- a/src/glvd/data/dist_cpe.py +++ b/src/glvd/data/dist_cpe.py @@ -64,18 +64,7 @@ class DistCpeMapperGardenlinux(DistCpeMapper): def __call__(self, codename: str) -> DistCpe: version: str = { - '1443.0': '1443.0', - '1443.1': '1443.1', - '1443.2': '1443.2', - '1443.3': '1443.3', - '1443.5': '1443.5', - '1443.7': '1443.7', - '1443.8': '1443.8', - '1443.9': '1443.9', - # latest patch release gets codename without the dot -> for cases where you want to follow the latest - '1443': '1443.10', - '1592.0': '1592.0', - '1592': '1592.1', + '1592': '1592.4', 'today': 'today', '': '', }[codename]