fix ca-certificates issues

canonical · Mar 13, 2024 · 3f124b8 · 3f124b8
1 parent 3e3ebb9
commit 3f124b8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 8 deletions.
diff --git a/2.10.0/rockcraft.yaml b/2.10.0/rockcraft.yaml
@@ -4,7 +4,7 @@ description: |
   Grafana Mimir is a horizontally scalable, highly available,
   multi-tenant, long-term storage for Prometheus.
 version: "2.10.0"
-base: ubuntu:22.04
+base: ubuntu@22.04
 license: Apache-2.0
 platforms:
   amd64: {}
@@ -34,3 +34,16 @@ parts:
       opt/mimir/bin/mimir: usr/bin/mimir
       opt/mimir/bin/mimirtool: usr/bin/mimirtool
       opt/mimir/bin/query-tee: usr/bin/query-tee
+  ca-certs:
+    plugin: nil
+    overlay-packages:
+      - ca-certificates
+  deb-security-manifest:
+    plugin: nil
+    after:
+      - mimir
+      - ca-certs
+    override-prime: |
+      set -x
+      mkdir -p $CRAFT_PRIME/usr/share/rocks/
+      (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query --admindir=$CRAFT_PRIME/var/lib/dpkg/ -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > $CRAFT_PRIME/usr/share/rocks/dpkg.query
diff --git a/2.10.4/rockcraft.yaml b/2.10.4/rockcraft.yaml
@@ -36,7 +36,7 @@ parts:
       opt/mimir/bin/query-tee: usr/bin/query-tee
   ca-certs:
     plugin: nil
-    stage-packages:
+    overlay-packages:
       - ca-certificates
   deb-security-manifest:
     plugin: nil

diff --git a/2.11.0/rockcraft.yaml b/2.11.0/rockcraft.yaml
@@ -36,7 +36,7 @@ parts:
       opt/mimir/bin/query-tee: usr/bin/query-tee
   ca-certs:
     plugin: nil
-    stage-packages:
+    overlay-packages:
       - ca-certificates
   deb-security-manifest:
     plugin: nil

diff --git a/2.6.0/rockcraft.yaml b/2.6.0/rockcraft.yaml
@@ -4,26 +4,23 @@ description: |
   Grafana Mimir is a horizontally scalable, highly available,
   multi-tenant, long-term storage for Prometheus.
 version: "2.6.0"
-base: ubuntu:22.04
+base: ubuntu@22.04
 license: Apache-2.0
-
 platforms:
   amd64: {}
-
 services:
   mimir:
     command: /usr/bin/mimir
     override: replace
     startup: enabled
-
 parts:
   mimir:
     plugin: go
     source: https://github.com/grafana/mimir
     source-type: git
     source-tag: "mimir-2.6.0"
     build-snaps:
-      - go
+      - go/1.20/stable
     build-environment:
       - BUILD_IN_CONTAINER: "false"
     override-build: |
@@ -37,3 +34,16 @@ parts:
       opt/mimir/bin/mimir: usr/bin/mimir
       opt/mimir/bin/mimirtool: usr/bin/mimirtool
       opt/mimir/bin/query-tee: usr/bin/query-tee
+  ca-certs:
+    plugin: nil
+    overlay-packages:
+      - ca-certificates
+  deb-security-manifest:
+    plugin: nil
+    after:
+      - mimir
+      - ca-certs
+    override-prime: |
+      set -x
+      mkdir -p $CRAFT_PRIME/usr/share/rocks/
+      (echo "# os-release" && cat /etc/os-release && echo "# dpkg-query" && dpkg-query --admindir=$CRAFT_PRIME/var/lib/dpkg/ -f '${db:Status-Abbrev},${binary:Package},${Version},${source:Package},${Source:Version}\n' -W) > $CRAFT_PRIME/usr/share/rocks/dpkg.query