Merge remote-tracking branch 'origin' into fix-fips-binary-name

spectrocloud · Dec 16, 2024 · de6ad06 · de6ad06
2 parents f59d2a3 + 4257707
commit de6ad06
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -40,3 +40,9 @@ jobs:
       - name: Build artifacts
         run: |
           earthly --ci --output +release --VERSION=${{ steps.version.outputs.version }}
+      - name: Build FIPS artifacts
+        run: |
+          earthly --ci --output +release-fips --VERSION=${{ steps.version.outputs.version }}
+      - name: List artifacts
+        run: |
+          ls -l build/*
diff --git a/Earthfile b/Earthfile
@@ -108,8 +108,10 @@ install-script:
     # https://github.com/spectrocloud/agent-mode/releases/download/v4.5.0-rc2/palette-agent-linux-amd64
     ARG AGENT_URL_PREFIX=https://github.com/spectrocloud/agent-mode/releases/download/${VERSION}
     LET BIN_PREFIX=palette-agent
+    LET SCRIPT_NAME=palette-agent-install.sh
     IF $FIPS
         SET BIN_PREFIX=palette-agent-fips
+        SET SCRIPT_NAME=palette-agent-install-fips.sh
     END
 
     ENV PE_VERSION=${PE_VERSION}
@@ -119,7 +121,7 @@ install-script:
 
     WORKDIR /workdir
     COPY palette-agent-install.sh.tmpl /workdir/palette-agent-install.sh.tmpl
-    RUN envsubst '${PE_VERSION} ${IMAGE_REPO} ${AGENT_URL_PREFIX} ${BIN_PREFIX}' < /workdir/palette-agent-install.sh.tmpl > /workdir/palette-agent-install.sh
-    RUN chmod +x /workdir/palette-agent-install.sh
+    RUN envsubst '${PE_VERSION} ${IMAGE_REPO} ${AGENT_URL_PREFIX} ${BIN_PREFIX}' < /workdir/palette-agent-install.sh.tmpl > /workdir/${SCRIPT_NAME}
+    RUN chmod +x /workdir/${SCRIPT_NAME}
 
-    SAVE ARTIFACT /workdir/palette-agent-install.sh AS LOCAL ./build/palette-agent-install.sh
+    SAVE ARTIFACT /workdir/${SCRIPT_NAME} AS LOCAL ./build/${SCRIPT_NAME}
diff --git a/README.md b/README.md
@@ -13,6 +13,7 @@ Before you begin, ensure you have the following installed:
 - `systemd-networkd` (required if palette is managing networks)
 - `systemd-resolved` (required if palette is managing DNS)
 - `systemd-timesyncd` (required if palette is managing NTP)
+- `rsyslog` (required for audit logs)
 
 ## Quick Start
 
@@ -40,7 +41,7 @@ curl -Ls https://github.com/spectrocloud/agent-mode/releases/latest/download/pal
 curl -Ls https://github.com/spectrocloud/agent-mode/releases/latest/download/palette-agent-install.sh | VERSION=v4.5.0 bash
 ```
 
-## FIPS
+## FIPS(Work In Progress)
 
 ```bash
 curl -Ls https://github.com/spectrocloud/agent-mode/releases/latest/download/palette-agent-install-fips.sh | bash