Skip to content

Use Kamal 2 and local registry#35

Merged
dhh merged 5 commits into
mainfrom
kamal2
Mar 5, 2026
Merged

Use Kamal 2 and local registry#35
dhh merged 5 commits into
mainfrom
kamal2

Conversation

@dhh

@dhh dhh commented Mar 5, 2026

Copy link
Copy Markdown
Member

No description provided.

Copilot AI review requested due to automatic review settings March 5, 2026 19:52

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Updates Skiff’s deployment scaffolding to target Kamal 2 defaults, using Kamal secrets and the built-in local registry instead of remote registry credentials.

Changes:

  • Switch templating from .env to .kamal/secrets and add .kamal directory creation.
  • Update deploy config to use Kamal 2 local registry (localhost:5555) and secret env wiring.
  • Refresh docs/ignores to reflect secrets-based configuration and Kamal 1 → 2 upgrade step.

Reviewed changes

Copilot reviewed 8 out of 9 changed files in this pull request and generated 4 comments.

Show a summary per file
File Description
lib/skiff/templates/site.rb Generates .kamal directory and secrets file instead of .env.
lib/skiff/templates/dotfiles/kamal-secrets.tt Defines the secrets template containing GIT_URL.
lib/skiff/templates/dotfiles/gitignore Ignores .kamal/secrets* (and still ignores .env).
lib/skiff/templates/dotfiles/dockerignore Excludes .kamal/secrets* from Docker build context.
lib/skiff/templates/config/deploy.yml.tt Adjusts env secrets + configures local registry + healthcheck path.
lib/skiff/templates/README.md.tt Documents Kamal 2 upgrade + secrets + local registry expectations.
kamal-skiff.gemspec Pins kamal dependency to ~> 2.0.
README.md Updates user-facing deploy/staging docs for Kamal 2 + secrets.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread lib/skiff/templates/dotfiles/kamal-secrets.tt Outdated
Comment thread lib/skiff/templates/site.rb
Comment thread lib/skiff/templates/dotfiles/gitignore Outdated
Comment on lines 1 to 3
# Ignore local secrets
/.kamal/secrets*
/.env

Copilot AI Mar 5, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment now only mentions local secrets, but the section still ignores /.env. Consider either updating the comment to mention both secrets and env files, or splitting into two commented sections so the ignore list remains self-explanatory.

Copilot uses AI. Check for mistakes.
Comment thread lib/skiff/templates/dotfiles/dockerignore
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Copilot AI review requested due to automatic review settings March 5, 2026 19:54

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

Copilot reviewed 9 out of 10 changed files in this pull request and generated 3 comments.


💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread lib/skiff/templates/config/deploy.yml.tt
Comment thread lib/skiff/templates/site.rb
Comment thread lib/skiff/templates/dotfiles/gitignore
@dhh dhh merged commit f9719c5 into main Mar 5, 2026
4 checks passed
@dhh dhh deleted the kamal2 branch March 5, 2026 19:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants