get package version from wolfi APKINDEX

replicatedhq · Dec 14, 2023 · f2ccb33 · f2ccb33
1 parent 9f67d08
commit f2ccb33
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 17 deletions.
diff --git a/.github/workflows/image-deps-updater.yaml b/.github/workflows/image-deps-updater.yaml
@@ -19,26 +19,21 @@ jobs:
     - name: Get tags
       id: get-tags
       run: |
-        minio_yaml=$(curl -s --fail --show-error https://raw.githubusercontent.com/wolfi-dev/os/main/minio.yaml)
-        minio_version=$(echo "$minio_yaml" | grep "version:" | awk '{print $2}' | tr -d '\n')
-        minio_epoch=$(echo "$minio_yaml" | grep "epoch:" | awk '{print $2}' | tr -d '\n')
+        curl -LO --fail --show-error https://packages.wolfi.dev/os/x86_64/APKINDEX.tar.gz
+        tar -xzvf APKINDEX.tar.gz
 
-        rqlite_yaml=$(curl -s --fail --show-error https://raw.githubusercontent.com/wolfi-dev/os/main/rqlite.yaml)
-        rqlite_version=$(echo "$rqlite_yaml" | grep "version:" | awk '{print $2}' | tr -d '\n')
-        rqlite_epoch=$(echo "$rqlite_yaml" | grep "epoch:" | awk '{print $2}' | tr -d '\n')
-
-        dex_yaml=$(curl -s --fail --show-error https://raw.githubusercontent.com/wolfi-dev/os/main/dex.yaml)
-        dex_version=$(echo "$dex_yaml" | grep "version:" | awk '{print $2}' | tr -d '\n')
-        dex_epoch=$(echo "$dex_yaml" | grep "epoch:" | awk '{print $2}' | tr -d '\n')
+        minio_version=$(cat APKINDEX | grep -A1 "^P:minio$" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
+        rqlite_version=$(cat APKINDEX | grep -A1 "^P:rqlite$" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
+        dex_version=$(cat APKINDEX | grep -A1 "^P:dex$" | tail -n 1 | sed -n -e 's/V://p' | tr -d '\n')
 
         sed "s/__MINIO_VERSION__/$minio_version/g" deploy/minio/apko.yaml.tmpl > deploy/minio/apko.yaml
         sed "s/__RQLITE_VERSION__/$rqlite_version/g" deploy/rqlite/apko.yaml.tmpl > deploy/rqlite/apko.yaml
         sed "s/__DEX_VERSION__/$dex_version/g" deploy/dex/apko.yaml.tmpl > deploy/dex/apko.yaml
 
         {
-          echo "minio-tag=$minio_version-$minio_epoch"
-          echo "rqlite-tag=$rqlite_version-$rqlite_epoch"
-          echo "dex-tag=$dex_version-$dex_epoch"
+          echo "minio-tag=$minio_version"
+          echo "rqlite-tag=$rqlite_version"
+          echo "dex-tag=$dex_version"
         } >> "$GITHUB_OUTPUT"
 
     - name: Build and push minio image

diff --git a/deploy/dex/apko.yaml.tmpl b/deploy/dex/apko.yaml.tmpl
@@ -4,7 +4,7 @@ contents:
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - dex~__DEX_VERSION__
+    - dex=__DEX_VERSION__
     - gomplate
     - bash
     - busybox

diff --git a/deploy/minio/apko.yaml.tmpl b/deploy/minio/apko.yaml.tmpl
@@ -4,7 +4,7 @@ contents:
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - minio~__MINIO_VERSION__
+    - minio=__MINIO_VERSION__
     - mc
     - bash
     - busybox

diff --git a/deploy/rqlite/apko.yaml.tmpl b/deploy/rqlite/apko.yaml.tmpl
@@ -4,8 +4,8 @@ contents:
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
   packages:
-    - rqlite~__RQLITE_VERSION__
-    - rqlite-oci-entrypoint
+    - rqlite=__RQLITE_VERSION__
+    - rqlite-oci-entrypoint=__RQLITE_VERSION__
     - bash
     - busybox
     - wolfi-baselayout