Skip to content

Commit 2875ca8

Browse files
author
mike dupont
committed
rework of patch
docker running starting debugging
1 parent 6ef747c commit 2875ca8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+1282
-292
lines changed

.github/workflows/image.yaml

+87-61
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,96 @@
1-
#
1+
22
name: Create and publish a Docker image
33

4-
# Configures this workflow to run every time a change is pushed to the branch called `release`.
54
on:
6-
release:
7-
types: [created]
8-
workflow_dispatch:
5+
workflow_dispatch:
6+
#push:
7+
#pull_request:
98

10-
# Defines two custom environment variables for the workflow. These are used for the Container registry domain, and a name for the Docker image that this workflow builds.
119
env:
12-
REGISTRY: ghcr.io
13-
IMAGE_NAME: ${{ github.repository }}
10+
REGISTRY: ghcr.io
11+
IMAGE_NAME: ${{ github.repository }}
1412

15-
# There is a single job in this workflow. It's configured to run on the latest available version of Ubuntu.
1613
jobs:
17-
build-and-push-image:
18-
runs-on: ubuntu-latest
19-
# Sets the permissions granted to the `GITHUB_TOKEN` for the actions in this job.
20-
permissions:
21-
contents: read
22-
packages: write
23-
attestations: write
24-
id-token: write
25-
#
26-
steps:
27-
- name: Checkout repository
28-
uses: actions/checkout@v4
29-
# Uses the `docker/login-action` action to log in to the Container registry using the account and password that will publish the packages. Once published, the packages are scoped to the account defined here.
30-
- name: Log in to the Container registry
31-
uses: docker/login-action@65b78e6e13532edd9afa3aa52ac7964289d1a9c1
32-
with:
33-
registry: ${{ env.REGISTRY }}
34-
username: ${{ github.actor }}
35-
password: ${{ secrets.GITHUB_TOKEN }}
36-
# This step uses [docker/metadata-action](https://github.com/docker/metadata-action#about) to extract tags and labels that will be applied to the specified image. The `id` "meta" allows the output of this step to be referenced in a subsequent step. The `images` value provides the base name for the tags and labels.
37-
- name: Extract metadata (tags, labels) for Docker
38-
id: meta
39-
uses: docker/metadata-action@9ec57ed1fcdbf14dcef7dfbe97b2010124a938b7
40-
with:
41-
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
42-
# This step uses the `docker/build-push-action` action to build the image, based on your repository's `Dockerfile`. If the build succeeds, it pushes the image to GitHub Packages.
43-
# It uses the `context` parameter to define the build's context as the set of files located in the specified path. For more information, see "[Usage](https://github.com/docker/build-push-action#usage)" in the README of the `docker/build-push-action` repository.
44-
# It uses the `tags` and `labels` parameters to tag and label the image with the output from the "meta" step.
45-
- name: Build and push Docker image
46-
id: push
47-
uses: docker/build-push-action@f2a1d5e99d037542a71f64918e516c093c6f3fc4
48-
with:
49-
context: .
50-
push: true
51-
tags: ${{ steps.meta.outputs.tags }}
52-
labels: ${{ steps.meta.outputs.labels }}
14+
15+
build-and-push-image:
16+
runs-on: ubuntu-latest
17+
permissions:
18+
contents: read
19+
packages: write
20+
attestations: write
21+
id-token: write
22+
23+
steps:
24+
#- name: Configure AWS credentials
25+
# uses: meta-introspector/configure-aws-credentials@v4
26+
# with:
27+
# aws-region: ${{ secrets.AWS_REGION || 'us-east-2'}}
28+
# role-session-name: github-actions-${{ env.APP_NAME || 'eliza'}}
29+
# # FIXME hard coded
30+
# role-to-assume: arn:aws:iam::${{ secrets.AWS_ACCOUNT_ID || '767503528736' }}:role/github
31+
32+
- name: Set up Docker Buildx
33+
uses: meta-introspector/setup-buildx-action@v3.8.0
34+
with:
35+
install: true
36+
platforms: linux/amd64,linux/arm/v7,linux/arm/v8
37+
38+
# - name: Login to Amazon ECR
39+
# id: login-ecr
40+
# uses: meta-introspector/amazon-ecr-login@v1
41+
42+
- name: Set short sha
43+
id: sha_short
44+
run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
45+
46+
- name: Login to Docker Hub
47+
uses: meta-introspector/login-action@v3
48+
with:
49+
username: ${{ vars.DOCKER_HUB_USERNAME }}
50+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
51+
52+
- name: Checkout repository
53+
uses: meta-introspector/checkout@v4
54+
55+
- name: Log in to the Container registry
56+
uses: meta-introspector/login-action@v3.0.0
57+
with:
58+
registry: ${{ env.REGISTRY }}
59+
username: ${{ github.actor }}
60+
password: ${{ secrets.GITHUB_TOKEN }}
61+
62+
- name: Extract metadata (tags, labels) for Docker
63+
id: meta
64+
uses: meta-introspector/metadata-action@v5.5.1
65+
with:
66+
images: |
67+
${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
68+
h4ckermike/elizaos-eliza
69+
# ${{ steps.login-ecr.outputs.registry }}/${{ env.ECR_REPOSITORY || 'agent/eliza'}}
70+
71+
- name: Build and push Docker image
72+
id: push
73+
uses: meta-introspector/build-push-action@v6.10.0
74+
with:
75+
platforms: linux/arm64,linux/arm64/v8
76+
context: .
77+
push: true
78+
tags: |
79+
${{ steps.meta.outputs.tags }}
80+
labels: ${{ steps.meta.outputs.labels }}
5381

54-
# This step generates an artifact attestation for the image, which is an unforgeable statement about where and how it was built. It increases supply chain security for people who consume the image. For more information, see "[AUTOTITLE](/actions/security-guides/using-artifact-attestations-to-establish-provenance-for-builds)."
55-
- name: Generate artifact attestation
56-
uses: actions/attest-build-provenance@v1
57-
with:
58-
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
59-
subject-digest: ${{ steps.push.outputs.digest }}
60-
push-to-registry: true
82+
- name: Generate artifact attestation
83+
uses: meta-introspector/attest-build-provenance@local
84+
with:
85+
subject-name: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME}}
86+
subject-digest: ${{ steps.push.outputs.digest }}
87+
push-to-registry: true
6188

62-
# This step makes the Docker image public, so users can pull it without authentication.
63-
- name: Make Docker image public
64-
run: |
65-
curl \
66-
-X PATCH \
67-
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
68-
-H "Accept: application/vnd.github.v3+json" \
69-
https://api.github.com/user/packages/container/${{ env.IMAGE_NAME }}/visibility \
70-
-d '{"visibility":"public"}'
89+
- name: Make Docker image public
90+
run: |
91+
curl \
92+
-X PATCH \
93+
-H "Authorization: Bearer ${{ secrets.GITHUB_TOKEN }}" \
94+
-H "Accept: application/vnd.github.v3+json" \
95+
https://api.github.com/user/packages/container/${{ env.IMAGE_NAME }}/visibility \
96+
-d '{"visibility":"public"}'

.github/workflows/pr.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
name: PR Title Check
22

33
on:
4-
pull_request:
5-
types: [opened, edited, synchronize]
4+
workflow_dispatch:
5+
66

77
jobs:
88
check-pr-title:

.github/workflows/tauri-ci.yml

+2-10
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,8 @@ env:
1111
PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
1212

1313
on:
14-
push:
15-
branches: [main, develop, v2-develop]
16-
paths:
17-
- 'packages/app/**'
18-
- '.github/workflows/**'
19-
pull_request:
20-
branches: [v2-develop]
21-
paths:
22-
- 'packages/app/**'
23-
- '.github/workflows/**'
14+
workflow_dispatch:
15+
2416

2517
jobs:
2618
test-build:

.github/workflows/test.yaml

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
name: testdocker
2+
on:
3+
workflow_dispatch:
4+
5+
env:
6+
REGISTRY: ghcr.io
7+
IMAGE_NAME: ${{ github.repository }}
8+
jobs:
9+
build-and-push-image:
10+
runs-on: ubuntu-latest
11+
permissions:
12+
contents: read
13+
packages: write
14+
attestations: write
15+
id-token: write
16+
steps:
17+
- name: Login to Docker Hub
18+
uses: meta-introspector/login-action@v3
19+
with:
20+
username: ${{ vars.DOCKER_HUB_USERNAME }}
21+
password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
22+
- name: Build and push Docker image
23+
id: push
24+
uses: meta-introspector/build-push-action@v6.10.0
25+
with:
26+
platforms: linux/arm64,linux/arm64/v8
27+
context: .
28+
push: true
29+
tags: |
30+
${{ steps.meta.outputs.tags }}
31+
labels: ${{ steps.meta.outputs.labels }}
32+
33+

.gitignore

+52-1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,55 @@ lerna-debug.log
6666
tsdoc_cache/
6767
tsdoc_comments/
6868

69-
**/elizaDb/**
69+
**/elizaDb/**# -*- mode: gitignore; -*-
70+
*~
71+
\#*\#
72+
/.emacs.desktop
73+
/.emacs.desktop.lock
74+
*.elc
75+
auto-save-list
76+
tramp
77+
.\#*
78+
79+
# Org-mode
80+
.org-id-locations
81+
*_archive
82+
83+
# flymake-mode
84+
*_flymake.*
85+
86+
# eshell files
87+
/eshell/history
88+
/eshell/lastdir
89+
90+
# elpa packages
91+
/elpa/
92+
93+
# reftex files
94+
*.rel
95+
96+
# AUCTeX auto folder
97+
/auto/
98+
99+
# cask packages
100+
.cask/
101+
dist/
102+
103+
# Flycheck
104+
flycheck_*.el
105+
106+
# server auth directory
107+
/server/
108+
109+
# projectiles files
110+
.projectile
111+
112+
# directory configuration
113+
.dir-locals.el
114+
115+
# network security
116+
/network-security.data
117+
118+
packages/autodoc/text_objects/*
119+
/env
120+
pglite/*

.gitmodules

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[submodule "vendor/elizaos/plugin-twitter"]
2+
path = vendor/elizaos/plugin-twitter
3+
url = https://github.com/meta-introspector/plugin-twitter
4+
[submodule "vendor/elizaos/agent-twitter-client"]
5+
path = vendor/elizaos/agent-twitter-client
6+
url = https://github.com/meta-introspector/agent-twitter-client.git
7+
[submodule "vendor/elizaos/client-twitter"]
8+
path = vendor/elizaos/client-twitter
9+
url = https://github.com/meta-introspector/client-twitter-eliza-zos
10+
[submodule "vendor/elizaos/client-discord-eliza"]
11+
path = vendor/elizaos/client-discord-eliza
12+
url = https://github.com/meta-introspector/client-discord-eliza-zos
13+
[submodule "vendor/elizaos/plugin-speech-tts"]
14+
path = vendor/elizaos/plugin-speech-tts
15+
url = https://github.com/meta-introspector/plugin-speech-tts-eliza-zos
16+
[submodule "vendor/elizaos/client-telegram"]
17+
path = vendor/elizaos/client-telegram
18+
url = https://github.com/meta-introspector/client-telegram-eliza-zos
19+
[submodule "characters"]
20+
path = characters
21+
url = https://github.com/meta-introspector/characters-eliza-zos

.nvmrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v23.3.0
1+
v23.9.0

.vscode/launch.json

+6
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,12 @@
44
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
55
"version": "0.2.0",
66
"configurations": [
7+
{
8+
"url": "ws://192.168.1.90:9229/hiva4rzuydf",
9+
"name": "Attach bun",
10+
"type": "bun",
11+
"request": "attach"
12+
},
713
{
814
"type": "node",
915
"request": "launch",

Dockerfile

+12-11
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ RUN npm install -g bun turbo@2.3.3
1515
# Set Python 3 as the default python
1616
RUN ln -s /usr/bin/python3 /usr/bin/python
1717

18+
FROM builder as installer
19+
1820
# Copy package files
1921
COPY .npmrc .
2022
COPY package.json .
@@ -27,15 +29,14 @@ COPY scripts ./scripts
2729
COPY packages ./packages
2830

2931

30-
3132
# Install dependencies
3233
RUN bun install
3334

3435
# Build the project
3536
RUN bun run build
3637

3738
# Create a new stage for the final image
38-
FROM node:23.3.0-slim
39+
FROM builder
3940

4041
WORKDIR /app
4142

@@ -48,15 +49,15 @@ RUN apt-get update && \
4849
# Install bun using npm
4950
RUN npm install -g bun turbo@2.3.3
5051

51-
# Copy built artifacts and production dependencies from the builder stage
52-
COPY --from=builder /app/package.json ./
53-
COPY --from=builder /app/tsconfig.json ./
54-
COPY --from=builder /app/turbo.json ./
55-
COPY --from=builder /app/lerna.json ./
56-
COPY --from=builder /app/renovate.json ./
57-
COPY --from=builder /app/node_modules ./node_modules
58-
COPY --from=builder /app/packages ./packages
59-
COPY --from=builder /app/scripts ./scripts
52+
# Copy built artifacts and production dependencies from the installer stage
53+
COPY --from=installer /app/package.json ./
54+
COPY --from=installer /app/tsconfig.json ./
55+
COPY --from=installer /app/turbo.json ./
56+
COPY --from=installer /app/lerna.json ./
57+
COPY --from=installer /app/renovate.json ./
58+
COPY --from=installer /app/node_modules ./node_modules
59+
COPY --from=installer /app/packages ./packages
60+
COPY --from=installer /app/scripts ./scripts
6061

6162
# Set environment variables
6263
ENV NODE_ENV=production

0 commit comments

Comments
 (0)