chore: update snapshot location

.github/workflows/ci.yaml

@@ -3,9 +3,9 @@ name: CI
 on:
   workflow_dispatch: # Allow manual runs.
   pull_request:
-    branches: [ 'main' ]
+    branches: ["main"]
   push:
-    branches: [ 'main' ]
+    branches: ["main"]
 
 permissions:
   contents: read
@@ -19,12 +19,12 @@ jobs:
       - name: Mount bazel caches
         uses: actions/cache@v4
         with:
-            path: |
-                ~/.cache/bazel-repo
-            key: bazel-cache-deps-ci1-${{ github.sha }}
-            restore-keys: |
-                bazel-cache-deps-ci1-${{ github.sha }}
-                bazel-cache-deps-ci1-
+          path: |
+            ~/.cache/bazel-repo
+          key: bazel-cache-deps-ci1-${{ github.sha }}
+          restore-keys: |
+            bazel-cache-deps-ci1-${{ github.sha }}
+            bazel-cache-deps-ci1-
       - name: Free space
         run: |
           sudo apt-get remove -y '^dotnet-.*'
@@ -57,12 +57,12 @@ jobs:
       - name: Mount bazel caches
         uses: actions/cache@v4
         with:
-            path: |
-                ~/.cache/bazel-repo
-            key: bazel-cache-deps-ci2-${{ github.sha }}
-            restore-keys: |
-                bazel-cache-deps-ci2-${{ github.sha }}
-                bazel-cache-deps-ci2-
+          path: |
+            ~/.cache/bazel-repo
+          key: bazel-cache-deps-ci2-${{ github.sha }}
+          restore-keys: |
+            bazel-cache-deps-ci2-${{ github.sha }}
+            bazel-cache-deps-ci2-
       - name: Free space
         run: |
           sudo apt-get remove -y '^dotnet-.*'
@@ -72,10 +72,13 @@ jobs:
           sudo apt-get autoremove -y
           sudo apt-get clean
           rm -rf /usr/share/dotnet/
+
       - name: Fetch
         run: |
-          for i in $(seq 5); do 
-            bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc fetch $(bazel query 'attr(tags, "amd64", ...)') && break || sleep 20;
+          for i in $(seq 20); do 
+            bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc query $(bazel query 'attr(tags, "amd64", ...)') && break
+            sleep 10;
           done
+
       - name: Image Tests
         run: bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc test $(bazel query 'attr(tags, "amd64", ...)')

.github/workflows/image-check.yaml

@@ -27,6 +27,12 @@ jobs:
             bazel-cache-deps-ci2-${{ github.sha }}
             bazel-cache-deps-ci2-
 
+      - name: Fetch
+        run: |
+          for i in $(seq 10); do 
+            bazel --bazelrc=$GITHUB_WORKSPACE/.github/workflows/ci.bazelrc cquery 'kind(merge_providers, deps(kind(oci_image, ...)))' --output=label --config=release && break || sleep 20;
+          done
+
       - name: Build all images
         run: bazel build //:sign_and_push
 

knife

@@ -44,7 +44,7 @@ function find_latest_snapshot() {
     local current="$(date -d '-1 day' +%Y-%m-%d)"
     local tmp=$(mktemp)
     local q=$(date -d "$current" +"year=%Y&month=%m")
-    if curl -fs "https://snapshot-cloudflare.debian.org/archive/debian/?$q" | grep -ohE "([0-9]+T[0-9]+Z)" > $tmp; then
+    if curl -fs "https://snapshot.debian.org/archive/debian/?$q" | grep -ohE "([0-9]+T[0-9]+Z)" > $tmp; then
       # same logic as above, find the newest snapshot that isn't "today"
       today=$(date +"%Y%m%dT")
       cat $tmp | grep -v $today | tail -n1

private/pkg/test/oci_image/fat_image_sbom.spdx.json

@@ -1 +1 @@
-{"spdxVersion":"SPDX-2.3","dataLicense":"CC0-1.0","SPDXID":"SPDXRef-DOCUMENT","name":"//private/pkg/test/oci_image:fat_image","documentNamespace":"http://spdx.org/spdxdocs/distroless/-slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","creationInfo":{"licenseListVersion":"NOASSERTION","creators":["Organization: distroless"],"created":"1970-01-01T00:00:00Z"},"packages":[{"name":"//private/pkg/test/oci_image:fat_image","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"//private/pkg/test/oci_image:image_arm64","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"base-files","SPDXID":"SPDXRef-bullseye-underscore-base-files-underscore-11.1-p-deb11u9-underscore-arm64","versionInfo":"11.1+deb11u9","supplier":"Person: Santiago Vila \\\\[email protected]\\\\u003e","downloadLocation":"https://snapshot-cloudflare.debian.org/archive/debian/20240509T203919Z/pool/main/b/base-files/base-files_11.1+deb11u9_arm64.deb","checksums":[{"algorithm":"SHA256","checksumValue":"c40dc4d5c6b82f5cfe75efa1a12bd09b9d5b9b8446ea045a991896a1ead8b02c"}],"copyrightText":"This is the Debian GNU/Linux prepackaged version of the Debian Base System\nMiscellaneous files. These files were written by Ian Murdock\n\[email protected]\u003e and Bruce Perens \[email protected]\u003e.\n\nThis package was first put together by Bruce Perens \[email protected]\u003e,\nfrom his own sources.\n\nThe GNU Public Licenses in /usr/share/common-licenses were taken from\nftp.gnu.org and are copyrighted by the Free Software Foundation, Inc.\n\nThe Artistic License in /usr/share/common-licenses is the one coming\nfrom Perl and its SPDX name is \"Artistic License 1.0 (Perl)\".\n\n\nCopyright (C) 1995-2011 Software in the Public Interest.\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nOn Debian GNU/Linux systems, the complete text of the GNU General\nPublic License can be found in `/usr/share/common-licenses/GPL'.\n","summary":"Debian base system miscellaneous files","description":"Debian base system miscellaneous files\nThis package contains the basic filesystem hierarchy of a Debian system, and\nseveral important miscellaneous files, such as /etc/debian_version,\n/etc/host.conf, /etc/issue, /etc/motd, /etc/profile, and others,\nand the text of several common licenses in use on Debian systems.","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:deb/debian/[email protected]+deb11u9?arch=arm64"}]},{"name":"@bullseye//base-files/arm64:spdx","SPDXID":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION","description":"Generated from [email protected]+deb11u9"},{"name":"//private/pkg/test/oci_image:image_amd64","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"netbase","SPDXID":"SPDXRef-bullseye-underscore-netbase-underscore-6.3-underscore-amd64","versionInfo":"6.3","supplier":"Person: Marco d'Itri \\\\[email protected]\\\\u003e","downloadLocation":"https://snapshot-cloudflare.debian.org/archive/debian/20240509T203919Z/pool/main/n/netbase/netbase_6.3_all.deb","checksums":[{"algorithm":"SHA256","checksumValue":"f444889ad3441758e3a5092418e062da2b0c6a811fdb0c262a6b70cb2518dbde"}],"copyrightText":"This package was created by Peter Tobias [email protected] on\nWed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns\n\[email protected]\u003e until 2001.\nIt is currently maintained by Marco d'Itri \[email protected]\u003e.\n\nCopyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri\n\nThe programs in this package are distributed under the terms of the GNU\nGeneral Public License, version 2 as distributed by the Free Software\nFoundation. On Debian systems, a copy of this license may be found in\n/usr/share/common-licenses/GPL-2.\n","summary":"Basic TCP/IP networking system","description":"Basic TCP/IP networking system\nThis package provides the necessary infrastructure for basic TCP/IP based\nnetworking.\n.\nIn particular, it supplies common name-to-number mappings in /etc/services,\n/etc/rpc, /etc/protocols and /etc/ethertypes.","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:deb/debian/[email protected]?arch=all"}]},{"name":"@bullseye//netbase/amd64:spdx","SPDXID":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION","description":"Generated from [email protected]"}],"relationships":[{"spdxElementId":"SPDXRef-DOCUMENT","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relationshipType":"DESCRIBES"},{"spdxElementId":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","relatedSpdxElement":"SPDXRef-bullseye-underscore-base-files-underscore-11.1-p-deb11u9-underscore-arm64","relationshipType":"GENERATED_FROM"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","relatedSpdxElement":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","relationshipType":"DEPENDS_ON"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","relationshipType":"CONTAINS"},{"spdxElementId":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","relatedSpdxElement":"SPDXRef-bullseye-underscore-netbase-underscore-6.3-underscore-amd64","relationshipType":"GENERATED_FROM"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","relatedSpdxElement":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","relationshipType":"DEPENDS_ON"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","relationshipType":"CONTAINS"}]}
+{"spdxVersion":"SPDX-2.3","dataLicense":"CC0-1.0","SPDXID":"SPDXRef-DOCUMENT","name":"//private/pkg/test/oci_image:fat_image","documentNamespace":"http://spdx.org/spdxdocs/distroless/-slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","creationInfo":{"licenseListVersion":"NOASSERTION","creators":["Organization: distroless"],"created":"1970-01-01T00:00:00Z"},"packages":[{"name":"//private/pkg/test/oci_image:fat_image","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"//private/pkg/test/oci_image:image_arm64","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"base-files","SPDXID":"SPDXRef-bullseye-underscore-base-files-underscore-11.1-p-deb11u9-underscore-arm64","versionInfo":"11.1+deb11u9","supplier":"Person: Santiago Vila \\\\[email protected]\\\\u003e","downloadLocation":"https://snapshot.debian.org/archive/debian/20240509T203919Z/pool/main/b/base-files/base-files_11.1+deb11u9_arm64.deb","checksums":[{"algorithm":"SHA256","checksumValue":"c40dc4d5c6b82f5cfe75efa1a12bd09b9d5b9b8446ea045a991896a1ead8b02c"}],"copyrightText":"This is the Debian GNU/Linux prepackaged version of the Debian Base System\nMiscellaneous files. These files were written by Ian Murdock\n\[email protected]\u003e and Bruce Perens \[email protected]\u003e.\n\nThis package was first put together by Bruce Perens \[email protected]\u003e,\nfrom his own sources.\n\nThe GNU Public Licenses in /usr/share/common-licenses were taken from\nftp.gnu.org and are copyrighted by the Free Software Foundation, Inc.\n\nThe Artistic License in /usr/share/common-licenses is the one coming\nfrom Perl and its SPDX name is \"Artistic License 1.0 (Perl)\".\n\n\nCopyright (C) 1995-2011 Software in the Public Interest.\n\nThis program is free software; you can redistribute it and/or modify\nit under the terms of the GNU General Public License as published by\nthe Free Software Foundation; either version 2 of the License, or\n(at your option) any later version.\n\nThis program is distributed in the hope that it will be useful,\nbut WITHOUT ANY WARRANTY; without even the implied warranty of\nMERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\nGNU General Public License for more details.\n\nOn Debian GNU/Linux systems, the complete text of the GNU General\nPublic License can be found in `/usr/share/common-licenses/GPL'.\n","summary":"Debian base system miscellaneous files","description":"Debian base system miscellaneous files\nThis package contains the basic filesystem hierarchy of a Debian system, and\nseveral important miscellaneous files, such as /etc/debian_version,\n/etc/host.conf, /etc/issue, /etc/motd, /etc/profile, and others,\nand the text of several common licenses in use on Debian systems.","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:deb/debian/[email protected]+deb11u9?arch=arm64"}]},{"name":"@bullseye//base-files/arm64:spdx","SPDXID":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION","description":"Generated from [email protected]+deb11u9"},{"name":"//private/pkg/test/oci_image:image_amd64","SPDXID":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION"},{"name":"netbase","SPDXID":"SPDXRef-bullseye-underscore-netbase-underscore-6.3-underscore-amd64","versionInfo":"6.3","supplier":"Person: Marco d'Itri \\\\[email protected]\\\\u003e","downloadLocation":"https://snapshot.debian.org/archive/debian/20240509T203919Z/pool/main/n/netbase/netbase_6.3_all.deb","checksums":[{"algorithm":"SHA256","checksumValue":"f444889ad3441758e3a5092418e062da2b0c6a811fdb0c262a6b70cb2518dbde"}],"copyrightText":"This package was created by Peter Tobias [email protected] on\nWed, 24 Aug 1994 21:33:28 +0200 and maintained by Anthony Towns\n\[email protected]\u003e until 2001.\nIt is currently maintained by Marco d'Itri \[email protected]\u003e.\n\nCopyright 1994-2010 Peter Tobias, Anthony Towns and Marco d'Itri\n\nThe programs in this package are distributed under the terms of the GNU\nGeneral Public License, version 2 as distributed by the Free Software\nFoundation. On Debian systems, a copy of this license may be found in\n/usr/share/common-licenses/GPL-2.\n","summary":"Basic TCP/IP networking system","description":"Basic TCP/IP networking system\nThis package provides the necessary infrastructure for basic TCP/IP based\nnetworking.\n.\nIn particular, it supplies common name-to-number mappings in /etc/services,\n/etc/rpc, /etc/protocols and /etc/ethertypes.","externalRefs":[{"referenceCategory":"PACKAGE-MANAGER","referenceType":"purl","referenceLocator":"pkg:deb/debian/[email protected]?arch=all"}]},{"name":"@bullseye//netbase/amd64:spdx","SPDXID":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","downloadLocation":"NOASSERTION","copyrightText":"NOASSERTION","description":"Generated from [email protected]"}],"relationships":[{"spdxElementId":"SPDXRef-DOCUMENT","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relationshipType":"DESCRIBES"},{"spdxElementId":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","relatedSpdxElement":"SPDXRef-bullseye-underscore-base-files-underscore-11.1-p-deb11u9-underscore-arm64","relationshipType":"GENERATED_FROM"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","relatedSpdxElement":"SPDXRef--at-bullseye-slash--slash-base-files-slash-arm64-colon-spdx","relationshipType":"DEPENDS_ON"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-arm64","relationshipType":"CONTAINS"},{"spdxElementId":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","relatedSpdxElement":"SPDXRef-bullseye-underscore-netbase-underscore-6.3-underscore-amd64","relationshipType":"GENERATED_FROM"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","relatedSpdxElement":"SPDXRef--at-bullseye-slash--slash-netbase-slash-amd64-colon-spdx","relationshipType":"DEPENDS_ON"},{"spdxElementId":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-fat-underscore-image","relatedSpdxElement":"SPDXRef--slash--slash-private-slash-pkg-slash-test-slash-oci-underscore-image-colon-image-underscore-amd64","relationshipType":"CONTAINS"}]}