Skip to content

Commit dc05950

Browse files
authored
fix: fips binary name in install script (#87)
Signed-off-by: Nianyu Shen <[email protected]>
1 parent 4257707 commit dc05950

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Earthfile

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -107,19 +107,21 @@ install-script:
107107
ARG IMAGE_REPO=${SPECTRO_PUB_REPO}/edge
108108
# https://github.com/spectrocloud/agent-mode/releases/download/v4.5.0-rc2/palette-agent-linux-amd64
109109
ARG AGENT_URL_PREFIX=https://github.com/spectrocloud/agent-mode/releases/download/${VERSION}
110+
LET BIN_PREFIX=palette-agent
111+
LET SCRIPT_NAME=palette-agent-install.sh
110112
IF $FIPS
111-
ARG SCRIPT_NAME=palette-agent-install-fips.sh
112-
ELSE
113-
ARG SCRIPT_NAME=palette-agent-install.sh
113+
SET BIN_PREFIX=palette-agent-fips
114+
SET SCRIPT_NAME=palette-agent-install-fips.sh
114115
END
115116

116117
ENV PE_VERSION=${PE_VERSION}
117118
ENV IMAGE_REPO=${IMAGE_REPO}
118119
ENV AGENT_URL_PREFIX=${AGENT_URL_PREFIX}
120+
ENV BIN_PREFIX=${BIN_PREFIX}
119121

120122
WORKDIR /workdir
121123
COPY palette-agent-install.sh.tmpl /workdir/palette-agent-install.sh.tmpl
122-
RUN envsubst '${PE_VERSION} ${IMAGE_REPO} ${AGENT_URL_PREFIX}' < /workdir/palette-agent-install.sh.tmpl > /workdir/${SCRIPT_NAME}
124+
RUN envsubst '${PE_VERSION} ${IMAGE_REPO} ${AGENT_URL_PREFIX} ${BIN_PREFIX}' < /workdir/palette-agent-install.sh.tmpl > /workdir/${SCRIPT_NAME}
123125
RUN chmod +x /workdir/${SCRIPT_NAME}
124126

125127
SAVE ARTIFACT /workdir/${SCRIPT_NAME} AS LOCAL ./build/${SCRIPT_NAME}

palette-agent-install.sh.tmpl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ for dep in "${dependencies[@]}"; do
2929
done
3030

3131
IMAGE=${IMAGE:-${IMAGE_REPO}/stylus-agent-mode-linux-${ARCH}:${VERSION}}
32-
URL=${URL:-${AGENT_URL_PREFIX}/palette-agent-linux-${ARCH}}
32+
URL=${URL:-${AGENT_URL_PREFIX}/${BIN_PREFIX}-linux-${ARCH}}
3333

34-
# Download edge-agent
34+
# Download palette-agent
3535
curl -v -L $URL -o palette-agent
3636
chmod +x palette-agent
3737

0 commit comments

Comments
 (0)