spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
825 Commits 34 Branches 83 Tags
71bc9bcf54e94c1c3544a0fc4db92bea1e6ab5b8
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Heinemeier Hansson 71bc9bcf54 Merge pull request #222 from basecamp/deploy-groups 
Allow booting containers in groups for rolling restarts
 2023-05-02 13:14:32 +02:00
David Heinemeier Hansson c83b74dcb7 Simplify domain language to just "boot" and unscoped config keys 2023-05-02 13:11:31 +02:00
David Heinemeier Hansson 54881a0298 Merge pull request #250 from basecamp/integration-test-healthcheck-wget 
Integration test healthcheck wget
 2023-05-02 10:27:49 +02:00
David Heinemeier Hansson 1a7d123746 Merge pull request #245 from basecamp/integration-test-wait-for-healthy 
Wait for healthy containers in integration test
 2023-04-25 16:54:22 +02:00
David Heinemeier Hansson bc8875e020 Merge pull request #183 from basecamp/cleanup-excessive-containers-running 
Clear stale containers
 2023-04-12 15:58:59 +02:00
David Heinemeier Hansson d4a72da9d8 Merge pull request #213 from ncreuschling/fix-spelling-of-label 
fix spelling of label
 2023-04-12 15:58:46 +02:00
David Heinemeier Hansson 04a04c05e0 Merge branch 'main' into fix-spelling-of-label 2023-04-12 15:58:41 +02:00
David Heinemeier Hansson cff8b058af Merge pull request #214 from tannakartikey/traefik_lables_readme_example_fix 
Traefik label example typo fix
 2023-04-12 15:58:08 +02:00
David Heinemeier Hansson b6f7d94ac3 Merge pull request #144 from monorkin/shell-escape-dollar-signs 
Shell escape dollar signs
 2023-04-12 15:57:37 +02:00
David Heinemeier Hansson 2f1393cd92 Merge pull request #212 from basecamp/role-primary-hosts 
Pull the primary host from the role
 2023-04-12 14:09:38 +02:00
David Heinemeier Hansson 76673c0c1b Merge pull request #211 from basecamp/minimise-lock-retention 
Minimise holding the deploy lock
 2023-04-12 14:08:05 +02:00
David Heinemeier Hansson 60a19f0b30 Bump version for 0.11.0 2023-04-12 11:45:33 +02:00
David Heinemeier Hansson 2d0a7e1b67 Merge pull request #208 from tannakartikey/add_labels_to_traefik 
Labels can be added to Traefik
 2023-04-12 11:35:28 +02:00
David Heinemeier Hansson 49df19fb0d Merge pull request #209 from ncreuschling/fix-roles-documentation 
fix typo role to roles
 2023-04-12 11:34:02 +02:00
David Heinemeier Hansson cef8fddfb4 Merge pull request #210 from basecamp/role-aware-rollbacks 
Make rollbacks role-aware
 2023-04-12 11:33:45 +02:00
David Heinemeier Hansson ab54dbdb8b Merge pull request #206 from tannakartikey/traefik_rule_docs 
Explained the latest modifications of Traefik container labels
 2023-04-11 14:18:31 +02:00
David Heinemeier Hansson ac3771447a Merge pull request #203 from matharvard/main 
Require net-ssh ~> 7.0 for SHA-2 support
 2023-04-11 14:17:52 +02:00
David Heinemeier Hansson daa0c9b5be Merge pull request #196 from handy-la/main 
Configurable max_attempts for healthcheck
 2023-04-11 14:17:17 +02:00
David Heinemeier Hansson 18031bc552 Merge pull request #202 from basecamp/deploy-lock-acquisition 
Improved deploy lock acquisition
 2023-04-10 16:42:03 +02:00
David Heinemeier Hansson fb1718ca6d Merge pull request #197 from tannakartikey/traefik_rules_with_destination 
Traefik service name to be derived from role and destination
 2023-04-10 15:11:07 +02:00
David Heinemeier Hansson 7d17a6c3b5 Excess CR 2023-04-10 15:10:08 +02:00
David Heinemeier Hansson f4133de896 Merge pull request #176 from dilpreet92/enable_ssh_over_proxy_command 
Enable ssh over proxy command
 2023-04-10 14:41:45 +02:00
David Heinemeier Hansson a9488e935d Style 2023-04-10 14:39:18 +02:00
David Heinemeier Hansson ac61528dfc Merge pull request #189 from basecamp/traefik-image 
Traefik image config for version pinning, upgrades, and custom images
 2023-04-10 14:35:30 +02:00
David Heinemeier Hansson 0eb7a8d087 Merge branch 'main' into pr/176 
* main:
  Simpler
  Make it explicit, focus on Ubuntu
  More explicit
  Not that --bundle is a Rails 7+ option
  Update README.md
  Update README.md
  Add github discussions link to readme
  Bump debug to fix missing deps in CI
  Only redact the non-sensitive bits of build args and env vars.
  improve code sample (traefik configuration)
 2023-04-10 14:31:43 +02:00
David Heinemeier Hansson 7559f439e9 Merge pull request #195 from nickhammond/patch-1 
Add github discussions link to readme
 2023-04-10 14:28:59 +02:00
David Heinemeier Hansson 54a5b90d8f Simpler 2023-04-10 14:28:52 +02:00
David Heinemeier Hansson a245adfad2 Merge pull request #200 from huksley/main 
Add sample commands to bootstrap non-root ssh server
 2023-04-10 14:27:13 +02:00
David Heinemeier Hansson f386c3bdab Make it explicit, focus on Ubuntu 2023-04-10 14:26:49 +02:00
David Heinemeier Hansson 2a3e576182 More explicit 2023-04-10 14:24:51 +02:00
David Heinemeier Hansson f3e3196ce5 Not that --bundle is a Rails 7+ option 2023-04-10 14:22:58 +02:00
David Heinemeier Hansson 2146f6d0ec Merge pull request #182 from basecamp/sensitive-args 
Only redact the non-sensitive bits of build args and env vars.
 2023-04-06 16:19:41 +02:00
David Heinemeier Hansson 52d8c112d3 Merge branch 'main' into pr/182 
* main:
  Bump debug to fix missing deps in CI
 2023-04-06 16:18:22 +02:00
David Heinemeier Hansson f851d6528d Merge pull request #169 from ncreuschling/patch-1 
improve code sample (traefik configuration)
 2023-04-05 16:31:10 +02:00
David Heinemeier Hansson 032266a76a Bump version for 0.10.1 2023-03-29 16:23:58 +02:00
David Heinemeier Hansson 33cc6c8bae Merge pull request #166 from calmyournerves/exit-code 
Set proper exit code on failure
 2023-03-29 16:21:54 +02:00
David Heinemeier Hansson 60916cdac3 Bump version for 0.10.0 2023-03-28 18:05:46 +02:00
David Heinemeier Hansson 1f83b5f6be Fix failure to pass on class options to subcommands 2023-03-28 18:04:16 +02:00
David Heinemeier Hansson 070c6e8e75 Merge pull request #165 from basecamp/pin-traefik-version 
Pin Traefik to v2.9.9
 2023-03-28 16:27:49 +02:00
David Heinemeier Hansson 7f178101f7 Merge pull request #164 from basecamp/accessory-hosts-or-roles 
Run accessories on multiple hosts or roles
 2023-03-28 14:31:24 +02:00
David Heinemeier Hansson aed345466f Dropped "all" 2023-03-28 14:28:54 +02:00
David Heinemeier Hansson fd5313ec3e Merge pull request #163 from milk1000cc/rolify-app-logs 
Rolify app logs cli/command
 2023-03-28 14:13:02 +02:00
David Heinemeier Hansson 4184d3204e Merge pull request #161 from tbuehlmann/push-latest-image 
Push <image>:latest in addition to <image>:<git-ref>
 2023-03-28 14:09:32 +02:00
David Heinemeier Hansson 01a2b678d7 Merge pull request #154 from basecamp/lock-deploys 
Deploy locks
 2023-03-24 15:50:33 +01:00
David Heinemeier Hansson 84540cee7b Merge branch 'main' into pr/154 
* main: (32 commits)
  Inline default as with other options
  Symbols!
  Fix tests
  test stop with custom stop wait time
  No need to replicate Docker default
  Describe purpose rather than elements
  Style and ordering
  Customizable stop wait time
  Fix tests
  Ensure it also works when configuring just log options without setting a driver
  Add accessory test
  Undo change
  Improve test
  Update README
  Ensure default log option `max-size=10m`
  #142 Allow to customize container options in accessories
  Fix flaky test
  Fix tests
  More resilient tests
  Fix other tests
  ...
 2023-03-24 15:43:17 +01:00
David Heinemeier Hansson 5bbb4aeb58 Merge pull request #131 from calmyournerves/global-logging-config 
Global logging configuration
 2023-03-24 15:36:11 +01:00
David Heinemeier Hansson 6a27a46e5f Inline default as with other options 2023-03-24 15:34:34 +01:00
David Heinemeier Hansson b5ccc1fa5d Merge branch 'main' into global-logging-config 2023-03-24 15:32:41 +01:00
David Heinemeier Hansson e2e5e18af9 Merge pull request #155 from basecamp/gracefully-shut-down-containers 
Customizable stop wait time
 2023-03-24 15:31:14 +01:00
David Heinemeier Hansson 4fa71834ad Symbols! 2023-03-24 15:27:11 +01:00
David Heinemeier Hansson 65663ae2ea Merge branch 'main' into pr/155 
* main:
  Describe purpose rather than elements
  Style and ordering
  #142 Allow to customize container options in accessories
 2023-03-24 15:25:45 +01:00
David Heinemeier Hansson fdb2502216 test stop with custom stop wait time 2023-03-24 15:22:34 +01:00
David Heinemeier Hansson a9bb8d7376 No need to replicate Docker default 2023-03-24 15:18:18 +01:00
David Heinemeier Hansson 53095a053e Describe purpose rather than elements 2023-03-24 15:16:38 +01:00
David Heinemeier Hansson 4ab5199853 Style and ordering 2023-03-24 15:16:15 +01:00
David Heinemeier Hansson 348f5844d5 Merge pull request #153 from javierav/feature/accessory-options 
#142 Allow to customize container options in accessories
 2023-03-24 15:09:12 +01:00
David Heinemeier Hansson 1f196045a9 Merge pull request #99 from tbuehlmann/role-awareness 
Role aware container names
 2023-03-24 15:01:34 +01:00
David Heinemeier Hansson 494e29d672 Fix tests 2023-03-24 14:35:17 +01:00
David Heinemeier Hansson 93423f2f20 Merge branch 'main' into pr/99 
* main:
  Wording
  Remove accessory images using tags rather than labels
  Update readme to point to ghcr.io/mrsked/mrsk
  Validate that all roles have hosts
  Commander needn't accumulate configuration
  Pull latest image tag, so we can identity it
  Default to deploying the config version
  Remove unneeded Dockerfile.dind, update Readme
  add D-in-D dockerfile, update Readme
 2023-03-24 14:26:31 +01:00
David Heinemeier Hansson 17e74910e4 Merge pull request #150 from basecamp/remove-accessory-image 
Remove accessory images using tags rather than labels
 2023-03-24 13:21:15 +01:00
David Heinemeier Hansson 8ebcafd3d8 Wording 2023-03-24 13:20:52 +01:00
David Heinemeier Hansson 89b4b909db Merge pull request #118 from kumulustech/kumulus/docker-in-docker 
Add docker in docker to Dockerfile for container dev
 2023-03-24 13:19:33 +01:00
David Heinemeier Hansson c89b77127b Merge pull request #143 from djmb/default-to-deploying-config-version 
Default to deploying the config version
 2023-03-24 12:36:20 +01:00
David Heinemeier Hansson e2d10ec5a9 Merge pull request #145 from basecamp/config-version 
Commander needn't accumulate configuration
 2023-03-23 17:51:30 +01:00
David Heinemeier Hansson 7e1596e722 Fix flaky test 2023-03-23 15:36:02 +01:00
David Heinemeier Hansson e7e3cd98eb Fix tests 2023-03-23 15:16:10 +01:00
David Heinemeier Hansson a1fc00347b Merge branch 'main' into pr/99 
* main:
  Ask for access token
  Style
  Style
  config.traefik is already nil safe
  Update README.md
  Bump dev deps and consolidate platform matches
  Deploys mention the released service@version
  Accessories aren't required to publish a port
  Accessories may be pulled from authenticated registries
  Polish destination config loading
  Allow arbitrary docker options for traefik
  Fixed typos
  Fixed readme
  Rebased on main
  Added volume configuration in response to issue coments
  Modified in response to PR comments
  Added the additional_ports configuration
 2023-03-23 14:48:13 +01:00
David Heinemeier Hansson f73c526890 Ask for access token 2023-03-23 14:46:41 +01:00
David Heinemeier Hansson 65b90dd5c8 Merge branch 'main' into default-to-deploying-config-version 2023-03-23 14:42:31 +01:00
David Heinemeier Hansson 9648721ce7 Merge pull request #146 from basecamp/tell-me-more 
Deploys mention the service and version
 2023-03-23 14:38:31 +01:00
David Heinemeier Hansson e409281bb2 Merge pull request #147 from basecamp/destination-config-polish 
Polish destination config loading
 2023-03-23 14:35:29 +01:00
David Heinemeier Hansson bab8e42965 Merge pull request #151 from basecamp/portless-accessories 
Accessories aren't required to publish a port
 2023-03-23 14:32:58 +01:00
David Heinemeier Hansson 110df5244b Merge pull request #152 from basecamp/deps 
Bump dev deps and consolidate platform matches
 2023-03-23 14:31:22 +01:00
David Heinemeier Hansson 01d684746e Merge pull request #100 from stepbeekio/feature/multiple-traefik-entrypoints 
Added the docker options override configuration for traefik
 2023-03-23 14:28:40 +01:00
David Heinemeier Hansson 951a71f38e Style 2023-03-23 14:26:12 +01:00
David Heinemeier Hansson 8b755c6973 Style 2023-03-23 14:24:34 +01:00
David Heinemeier Hansson 9a909ba7eb config.traefik is already nil safe 2023-03-23 14:06:15 +01:00
David Heinemeier Hansson 14512fe409 Update README.md 2023-03-23 12:10:56 +01:00
David Heinemeier Hansson e97216b0ea Merge pull request #149 from basecamp/private-accessories 
Private accessory images
 2023-03-23 09:57:39 +01:00
David Heinemeier Hansson 19104cafb4 Merge branch 'main' into role-awareness 2023-03-21 08:20:26 -04:00
David Heinemeier Hansson 83dc82661b Merge pull request #125 from calmyournerves/fix-destination-filter 
Fix label filters when destination is passed
 2023-03-21 07:44:59 -04:00
David Heinemeier Hansson 60faf27a05 More resilient tests 2023-03-20 17:40:36 +01:00
David Heinemeier Hansson 43d1ecc94b Fix other tests 2023-03-20 17:33:13 +01:00
David Heinemeier Hansson 00b970323b Merge branch 'main' into pr/99 
* main:
  Add another assertion for `escape_shell_value`
  Add tests for `Mrsk::Utils`
  Fix indentation
  Don't report exception here too
  Don't report exception
  Add CLI tests for remaining commands that are not tested yet
  Minor: Properly require active_support
 2023-03-20 17:31:50 +01:00
David Heinemeier Hansson d0c4030257 Merge pull request #128 from calmyournerves/utils-tests 
Tests for `Mrsk::Utils`
 2023-03-20 02:28:42 -04:00
David Heinemeier Hansson d167e48584 Merge pull request #122 from calmyournerves/add-cli-tests 
Add CLI tests for remaining commands that are not tested yet
 2023-03-16 09:31:28 -04:00
David Heinemeier Hansson d071246865 Merge pull request #119 from ylecuyer/active_support-yle 
Minor: Properly require active_support
 2023-03-16 09:29:34 -04:00
David Heinemeier Hansson cb824bdc42 Merge branch 'main' into role-awareness 2023-03-14 19:11:10 -04:00
David Heinemeier Hansson c282461265 Merge pull request #116 from tbuehlmann/traefik-command-options 
Properly pass traefik command options
 2023-03-14 15:08:27 -04:00
David Heinemeier Hansson dcbe038555 Merge pull request #117 from calmyournerves/cli-main-tests 
Add tests for main CLI commands
 2023-03-14 15:07:07 -04:00
David Heinemeier Hansson fa07c2403c Merge pull request #113 from moomerman/fix-healthcheck-test 
Fix healthcheck test
 2023-03-13 16:10:17 +01:00
David Heinemeier Hansson 9b666e54f3 Update README.md 2023-03-13 10:43:44 -04:00
David Heinemeier Hansson d2f76dac6b Merge branch 'main' into role-awareness 2023-03-13 15:16:44 +01:00
David Heinemeier Hansson bf3d3f3ba7 Merge pull request #101 from davegudge/fix-docker-publish 
fix: GitHub Workflow: Docker Publish
 2023-03-13 15:14:06 +01:00
David Heinemeier Hansson 20733a4493 Merge pull request #102 from moomerman/cmd-options-for-healthcheck 
Use custom web options for healthcheck
 2023-03-13 15:12:25 +01:00
David Heinemeier Hansson a267c1e835 Merge pull request #103 from 99linesofcode/fix-dockerfile-buildx 
Install buildx inside container
 2023-03-13 15:11:37 +01:00
David Heinemeier Hansson c1c26a154d Merge pull request #104 from moomerman/add-container-name-env-var 
Add container name env var for containers
 2023-03-13 15:10:02 +01:00
David Heinemeier Hansson 5969ff66d5 Merge pull request #107 from clowder/order-options-dig 
Avoid `[ActiveSupport::OrderedOptions#dig]`
 2023-03-13 15:08:31 +01:00
David Heinemeier Hansson b1f5165dc0 Merge pull request #108 from clowder/patch-1 
Update `accessory remove` description and warning
 2023-03-13 15:07:47 +01:00
David Heinemeier Hansson cce0fafdc4 Merge pull request #110 from kjellberg/patch-1 
Update README.md to reflect backtick escaping in Utils.optionize
 2023-03-13 15:07:09 +01:00