update project structure

.github/workflows/bundle.yaml → .github/workflows/cd.yaml

@@ -1,15 +1,17 @@
-name: Bundle
-
+name: CD
 on:
   push:
     branches:
       - main
     tags:
-      - 'bundle/v*.*.*'
-
+      - '*/v*.*.*'
 jobs:
-  publish-bundle:
-    name: Build and push bundle image
+  publish:
+    strategy:
+      matrix:
+        image: [ plural-cli, plural-bundle, trust-manager-bundle ]
+    name: Build and push ${{ matrix.image }} image
+    if: startsWith(github.ref, format('refs/tags/{0}', matrix.image)) || github.ref == 'refs/heads/main'
     runs-on: ubuntu-22.04
     permissions:
       contents: 'read'
@@ -23,11 +25,11 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            ghcr.io/pluralsh/kairos-plural-bundle
-            docker.io/pluralsh/kairos-plural-bundle
+            ghcr.io/pluralsh/kairos-${{matrix.image}}
+            docker.io/pluralsh/kairos-${{matrix.image}}
           tags: |
             type=sha
-            type=match,pattern=bundle/v(.*),group=1
+            type=match,pattern=${{matrix.image}}/v(.*),group=1
             type=raw,value=latest,enable={{is_default_branch}}
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v3
@@ -47,8 +49,8 @@ jobs:
       - name: Build and push
         uses: docker/build-push-action@v6
         with:
-          context: "."
-          file: "./bundle.Dockerfile"
+          context: "images/${{matrix.image}}/."
+          file: "images/${{matrix.image}}/Dockerfile"
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

@@ -1,6 +1,5 @@
 # Build artifacts
 /build
-/old/build
 
 # IDE files
 /.idea

README.md

@@ -14,7 +14,7 @@ The general process of setting up your Raspberry Pi 4 is pretty straightforward,
 and it can be started with the following command:
 
 ```bash
-curl -fsSL -o get-plural-edge-rpi4 https://raw.githubusercontent.com/pluralsh/edge/main/scripts/get-plural-edge-rpi4
+curl -fsSL -o get-plural-edge-rpi4 https://raw.githubusercontent.com/pluralsh/edge/main/hack/get-plural-edge-rpi4
 chmod 700 get-plural-edge-rpi4
 ./get-plural-edge-rpi4
 ```

scripts/get-plural-edge-rpi4 → hack/get-plural-edge-rpi4

@@ -23,7 +23,7 @@ read -p "Please enter password for kairos user: " -rs PASSWORD
 echo -e ""
 
 echo "Downloading cloud-config.yaml..."
-curl --silent https://raw.githubusercontent.com/pluralsh/edge/main/cloud-config.yaml -o cloud-config.yaml
+curl --silent https://raw.githubusercontent.com/pluralsh/edge/main/hack/cloud-config.yaml -o cloud-config.yaml
 
 echo "Templating cloud-config.yaml..."
 templ "URL" "${URL}" cloud-config.yaml