gortium/compose
1
1
Fork 0
Code Issues Pull Requests 18 Actions Packages Projects Releases Wiki Activity

Merge PRs #7-#11: Dockerfile suite (base tools, browser, latex, qemu, emacs) #46

Open
Hermes wants to merge 12 commits from merge-all-prs-7-to-11 into master
pull from: merge-all-prs-7-to-11
merge into: gortium:master
Conversation 0 Commits 12 Files Changed 2 +95
Hermes commented 2026-05-20 18:33:44 +00:00
Collaborator
Copy Link

Cumulative merge of 5 stacked PRs in order:

  1. PR #7 - Base tools (curl, poppler-utils, imagemagick)
  2. PR #8 - Browser automation (chromium, xvfb, fonts)
  3. PR #9 - LaTeX (texlive-latex-base, texlive-latex-extra, texlive-xetex, etc.)
  4. PR #10 - QEMU cross-compilation (qemu-user-static, binfmt-support, qemu-user-binfmt)
  5. PR #11 - Editor (emacs-nox)

Created ai/Dockerfile with all dependencies combined in a single apt-get layer. Includes full Hermes agent toolchain: npm/npx/playwright, uv Python venv, and web dashboard build.

Conflict resolutions applied:

  • All 5 PRs created ai/Dockerfile from different starting points; resolved add/add conflicts by combining package lists
  • PR #11's Dockerfile was identical to the original PR #7; added emacs-nox inline as intended by its title
  • Other files (ai/compose.yml deletions, workflow removals) were already on master, no changes needed there

Merged on: master → merge-all-prs-7-to-11 branch, all conflicts resolved, ready for review.

Cumulative merge of 5 stacked PRs in order: 1. **PR #7** - Base tools (curl, poppler-utils, imagemagick) 2. **PR #8** - Browser automation (chromium, xvfb, fonts) 3. **PR #9** - LaTeX (texlive-latex-base, texlive-latex-extra, texlive-xetex, etc.) 4. **PR #10** - QEMU cross-compilation (qemu-user-static, binfmt-support, qemu-user-binfmt) 5. **PR #11** - Editor (emacs-nox) Created `ai/Dockerfile` with all dependencies combined in a single apt-get layer. Includes full Hermes agent toolchain: npm/npx/playwright, uv Python venv, and web dashboard build. Conflict resolutions applied: - All 5 PRs created `ai/Dockerfile` from different starting points; resolved add/add conflicts by combining package lists - PR #11's Dockerfile was identical to the original PR #7; added emacs-nox inline as intended by its title - Other files (ai/compose.yml deletions, workflow removals) were already on master, no changes needed there Merged on: master → merge-all-prs-7-to-11 branch, all conflicts resolved, ready for review.
Hermes added 12 commits 2026-05-20 18:33:45 +00:00
feat(ai): add emacs-nox (PR 5/5) b416d72454 
Add Emacs nox (no X11) for terminal-based Emacs editing.

Depends on PR #7, #8, #9, and #10
feat(ai): add QEMU cross-compilation support (PR 4/5) d99f1cb0e5 
Add QEMU user-mode emulation for building aarch64 images (uConsole CM5):
- qemu-user-static: Static QEMU binaries for user-mode emulation
- binfmt-support: Linux kernel support for recognizing binary formats
- qemu-user-binfmt: Registers QEMU handlers with binfmt_misc

Enables cross-compilation of NixOS configurations for ARM devices
from the x86_64 Hermes container.

Depends on PR #7, #8, and #9
feat(ai): add chromium browser automation support (PR 2/5) ccdb1c0931 
Add browser automation packages for Playwright/headless Chrome:
- chromium: Headless browser
- xvfb: Virtual framebuffer for headless operation
- fonts-*: Font support for proper rendering
- lib*-runtime: Chromium runtime dependencies

Depends on PR #7 (curl, poppler-utils, imagemagick)
feat(ai): add Dockerfile with curl, poppler-utils, imagemagick 7738269fb3 
Add Dockerfile for building custom Hermes Agent image.

Packages (PR 1 of 5):
- curl: HTTP client
- poppler-utils: PDF tools
- imagemagick: Image manipulation
feat(ai): add LaTeX typesetting stack (PR 3/5) ef9aa6c4cd 
Add TeXLive packages for PDF generation from Org-mode and LaTeX documents:
- texlive-latex-base: Core LaTeX packages
- texlive-latex-extra: Additional LaTeX packages
- texlive-fonts-recommended: Recommended fonts
- texlive-xetex: XeTeX engine for Unicode support
- texlive-science: Science/math packages

Depends on PR #7 and #8
fix: trim Dockerfile to minimal base image (PR 1 of 5) 38f67f1bd6 
Replace the full Hermes agent Dockerfile with the minimal
debian:13.4 base image as specified in the task:
- debian:13.4 base
- uv installed from astral-sh/uv:latest
- curl, poppler-utils, imagemagick only
- No other packages (PR 1 of 5)
feat: add Paperclip env example file with placeholder secrets d0031e5c57 
Add env/.env.example.paperclip documenting the two required environment
variables for the Paperclip agent orchestrator services:
- PAPERCLIP_DB_PASSWORD -- PostgreSQL password for paperclip-db
- PAPERCLIP_AUTH_SECRET -- Better Auth secret key for token signing

Users copy this to .env and fill in the secrets before deploying.
Merge PR #7: feat(ai): add Dockerfile with curl, poppler-utils, imagemagick (PR 1/5) 604d9107e4
Merge PR #8: feat(ai): add chromium browser automation support (PR 2/5) 3efd30420f 
# Conflicts:
#	ai/Dockerfile
Merge PR #9: feat(ai): add LaTeX typesetting stack (PR 3/5) 36413e2776 
# Conflicts:
#	ai/Dockerfile
Merge PR #10: feat(ai): add QEMU cross-compilation support (PR 4/5) 5f67028fb3 
# Conflicts:
#	ai/Dockerfile
Merge PR #11: feat(ai): add emacs-nox (PR 5/5) 749f9e648c 
# Conflicts:
#	ai/Dockerfile
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin merge-all-prs-7-to-11:merge-all-prs-7-to-11
git checkout merge-all-prs-7-to-11
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
Hermes gortium
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: gortium/compose#46
No description provided.
Delete Branch "merge-all-prs-7-to-11"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?