diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml index 3931bfea05..dfe8633c57 100644 --- a/.github/workflows/image.yaml +++ b/.github/workflows/image.yaml @@ -77,7 +77,6 @@ jobs: push: true tags: | ${{ steps.meta.outputs.tags }} - arm64 labels: ${{ steps.meta.outputs.labels }} - name: Generate artifact attestation diff --git a/Dockerfile b/Dockerfile index ccf2111461..b19b372299 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,10 @@ # Use a specific Node.js version for better reproducibility #FROM node:23.3.0-slim AS builder # note this architecture is listed twice in this file! -FROM arm64v8/node:23-bookworm-slim AS builder +#FROM node:23-bookworm-slim AS builder +FROM arm64v8/node:23-bookworm-slim AS builder +#docker pull RUN apt-get update RUN apt-get install -y bash RUN apt-get install -y curl python3 @@ -32,7 +34,12 @@ RUN pnpm install \ # Create a new stage for the final image #FROM node:23.3.0-slim -FROM arm64v8/node:23-bookworm-slim +#FROM node:23-bookworm-slim +FROM h4ckermike/fastembed-js:pr-1 AS fastembed + +# dont do anything to this fast embed + +FROM arm64v8/node:23-bookworm-slim # Install runtime dependencies if needed RUN apt-get update @@ -49,6 +56,7 @@ COPY --from=builder /app/pnpm-workspace.yaml ./ COPY --from=builder /app/.npmrc ./ COPY --from=builder /app/turbo.json ./ COPY --from=builder /app/node_modules ./node_modules +COPY --from=fastembed /app/node_modules/fastembed ./node_modules/fastembed COPY --from=builder /app/agent ./agent COPY --from=builder /app/packages ./packages COPY --from=builder /app/scripts ./scripts diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index 6fc86196c5..b1852de50d 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -7,6 +7,7 @@ packages: - "packages/plugin-tee" - "packages/plugin-bootstrap" - "packages/plugin-twitter" + - "packages/adapter-sqlite" - "!packages/adapter-pglite/**" - "!packages/adapter-postgres/**" - "!packages/adapter-redis/**" diff --git a/scripts/node.sh b/scripts/node.sh index a7f6c80e81..faace08059 100644 --- a/scripts/node.sh +++ b/scripts/node.sh @@ -1,4 +1,4 @@ - +# review this code curl -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION=10.0.0 sh - . ~/.bashrc @@ -13,3 +13,13 @@ nvm use 23 cd /opt/agent pnpm install + +curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh + +. "$HOME/.cargo/env" # For sh/bash/zsh/ash/dash/pdksh + +apt install tmux build-essential + + +echo for fun : +echo apt install emacs-nox diff --git a/set_secrets.sh b/set_secrets.sh new file mode 100644 index 0000000000..62e44a1566 --- /dev/null +++ b/set_secrets.sh @@ -0,0 +1,3 @@ + +# sets the parameter +aws ssm put-parameter --name "agent_openai_key" --value "${OPENAI_API_KEY}" --type String diff --git a/systemd/agent-docker.service b/systemd/agent-docker.service index 77f260c533..ee4b99c6fc 100644 --- a/systemd/agent-docker.service +++ b/systemd/agent-docker.service @@ -21,10 +21,10 @@ ExecStartPre=-/usr/bin/docker rm %n || echo cannot preremove #FIXME hardcoded aws id ExecStartPre=/usr/bin/bash -c 'docker login -u AWS -p $(aws ecr get-login-password --region us-east-2) 767503528736.dkr.ecr.us-east-2.amazonaws.com' -ExecStartPre=/usr/bin/docker pull 767503528736.dkr.ecr.us-east-2.amazonaws.com/agent/eliza:feature-micro +ExecStartPre=/usr/bin/docker pull 767503528736.dkr.ecr.us-east-2.amazonaws.com/agent/eliza:feature-arm64_fastembed # must run in /app where the docker installed the node modules for now -ExecStart=/usr/bin/docker run -p 3000:3000 --mount type=bind,source=/opt/agent,target=/opt/agent --env-file /var/run/agent/secrets/env --rm --name %n 767503528736.dkr.ecr.us-east-2.amazonaws.com/agent/eliza:feature-micro +ExecStart=/usr/bin/docker run -p 3000:3000 --mount type=bind,source=/opt/agent,target=/opt/agent --env-file /var/run/agent/secrets/env --rm --name %n 767503528736.dkr.ecr.us-east-2.amazonaws.com/agent/eliza:feature-arm64_fastembed # FIXME: update cloudwatch logs StandardOutput=file:/var/log/agent_systemd.log