download schemahero binary and fix apko configs

replicatedhq · Jan 24, 2024 · 2fb9414 · 2fb9414
1 parent 04a8e8e
commit 2fb9414
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 6 deletions.
diff --git a/.github/actions/build-custom-melange-package/action.yml b/.github/actions/build-custom-melange-package/action.yml
@@ -20,23 +20,36 @@ inputs:
 runs:
   using: "composite"
   steps:
-    - id: cache-dir
-      shell: bash
-      run: echo "cache_dir=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
-
     - name: configure packages for arm64
       if: inputs.arch == 'arm64'
       shell: bash
       run: |
         sudo apt-get update -y
         sudo apt-get install -y curl gettext-base pkg-config
 
+    - if: inputs.component == 'kotsadm-migrations'
+      uses: falti/dotenv-action@v1
+      id: dotenv
+      with:
+        path: .image.env
+
+    - if: inputs.component == 'kotsadm-migrations'
+      uses: shrink/actions-docker-extract@v3
+      with:
+        image: schemahero/schemahero:${{ steps.dotenv.outputs.SCHEMAHERO_TAG }}
+        path: /schemahero
+        destination: migrations
+
     - name: template melange config
       shell: bash
       run: |
         export GIT_TAG=${{ inputs.git-tag }}
         envsubst '${GIT_TAG}' < ${{ inputs.context }}/melange.yaml.tmpl > ${{ inputs.context }}/melange.yaml
 
+    - id: cache-dir
+      shell: bash
+      run: echo "cache_dir=$(go env GOMODCACHE)" >> "$GITHUB_OUTPUT"
+
     - uses: chainguard-dev/actions/melange-build@main
       with:
         config: ${{ inputs.context }}/melange.yaml

diff --git a/kurl_proxy/deploy/apko.yaml.tmpl b/kurl_proxy/deploy/apko.yaml.tmpl
@@ -4,7 +4,8 @@ contents:
     - ./packages/
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
-    - ./melange.rsa.pub
+    - ./melange-arm64.rsa.pub
+    - ./melange-amd64.rsa.pub
   packages:
     - kurl-proxy-head  # This is expected to be built locally by `melange`.
     - bash

diff --git a/migrations/deploy/apko.yaml.tmpl b/migrations/deploy/apko.yaml.tmpl
@@ -4,7 +4,8 @@ contents:
     - ./packages/
   keyring:
     - https://packages.wolfi.dev/os/wolfi-signing.rsa.pub
-    - ./melange.rsa.pub
+    - ./melange-arm64.rsa.pub
+    - ./melange-amd64.rsa.pub
   packages:
     - kotsadm-migrations-head  # This is expected to be built locally by `melange`.
     - bash