Skip to content

Commit

Permalink
Ingest data for Garden Linux 1592.4
Browse files Browse the repository at this point in the history
  • Loading branch information
fwilhe committed Dec 6, 2024
1 parent 6a0521e commit d9be7ab
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
tmp/*
venv
package-list
package-list*
6 changes: 4 additions & 2 deletions Containerfile.apt-source
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
2 changes: 1 addition & 1 deletion conf/ingest-debsrc/gardenlinux.sources
Original file line number Diff line number Diff line change
@@ -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
3 changes: 3 additions & 0 deletions ingest-postgres.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 1 addition & 12 deletions src/glvd/data/dist_cpe.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit d9be7ab

Please sign in to comment.