spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
703 Commits 34 Branches 83 Tags
b5ccc1fa5d840d0bd272208f663c2809d501475f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Heinemeier Hansson 3026a92c98 Merge pull request #71 from tbuehlmann/destination-awareness 
Destination aware container names
 2023-03-09 13:25:49 +00:00
David Heinemeier Hansson ab7c6c6540 Use compact.join strategy here too 2023-03-09 14:24:19 +01:00
David Heinemeier Hansson 11f4dbfc5f Bump version for 0.9.1 2023-03-09 14:11:42 +01:00
David Heinemeier Hansson 15e879e83c Merge pull request #97 from martinbjeldbak/syntax-error-docker-install 
Fix syntax error in dependency install step
 2023-03-09 13:11:22 +00:00
David Heinemeier Hansson 2f454c39e7 Bump version for 0.9.0 2023-03-09 11:22:44 +01:00
David Heinemeier Hansson 12f5b780b8 Merge pull request #93 from calmyournerves/update-readme-dockerfile-context 
Update README with `dockerfile` and `context` builder options
 2023-03-09 10:21:19 +00:00
David Heinemeier Hansson 3b7836f8e3 Merge pull request #95 from mrsked/cmd-args-for-roles 
Custom options per role
 2023-03-09 10:20:50 +00:00
David Heinemeier Hansson 64cc081f10 Explain container options 2023-03-09 11:20:28 +01:00
David Heinemeier Hansson 1f784176b7 Allow value-less options with true 2023-03-09 11:17:28 +01:00
David Heinemeier Hansson d3f07d6313 Allow custom options per role 2023-03-09 11:09:19 +01:00
David Heinemeier Hansson 98a14f6173 Add cmd args for roles 2023-03-09 11:01:06 +01:00
David Heinemeier Hansson 487fcd4cea Only used for traefik 2023-03-09 11:00:52 +01:00
David Heinemeier Hansson c8badea6dd Extract argumentization for cmd and add proper escaping 2023-03-09 10:54:53 +01:00
David Heinemeier Hansson 5a3ea24c6b Merge pull request #77 from calmyournerves/dockerfile-context-build-options 
Allow setting the Dockerfile and the Docker build context when building
 2023-03-09 08:32:57 +00:00
David Heinemeier Hansson a06c19633c Merge pull request #92 from kjellberg/fix-traefik-host-port 
fix: mrsk run command fails when traefik config is empty
 2023-03-09 08:31:20 +00:00
David Heinemeier Hansson 46bec120c8 Test running without special config 2023-03-09 09:30:09 +01:00
David Heinemeier Hansson 0431bb5f97 Extract named constant and method 2023-03-09 09:29:56 +01:00
David Heinemeier Hansson 7f0e6f1f13 Merge pull request #85 from clowder/traefik-host-port 
Customizable Traefik host port
 2023-03-08 17:06:51 +00:00
David Heinemeier Hansson 2e9d877185 Merge pull request #88 from simonrand/ensure-curl-is-available 
Ensure curl is installed on hosts during bootstrapping
 2023-03-08 17:05:40 +00:00
David Heinemeier Hansson 347046019f Add test 2023-03-08 18:05:06 +01:00
David Heinemeier Hansson 3457c3f606 Style 2023-03-08 18:05:00 +01:00
David Heinemeier Hansson 155384472a Allow primary host even when a specific role has been set 2023-03-08 18:00:13 +01:00
David Heinemeier Hansson 32ab79c0cc Merge pull request #91 from kjellberg/lookup_username 
Allow registry username to reference a secret
 2023-03-08 16:44:09 +00:00
David Heinemeier Hansson a4d576f105 Test ENV username 2023-03-08 17:43:29 +01:00
David Heinemeier Hansson b809a971e2 One purpose per method 2023-03-08 17:43:23 +01:00
David Heinemeier Hansson 8c69990dbb Merge pull request #82 from AxelTheGerman/ed25519 
Add ed25519 and bcrypt_pbkdf to gemspec
 2023-03-05 09:35:26 +01:00
David Heinemeier Hansson 013121c55d Merge pull request #80 from kjellberg/patch-1 
Publish Docker image for each release
 2023-03-04 17:27:15 +01:00
David Heinemeier Hansson 41168e8c23 Merge pull request #79 from calmyournerves/patch-1 
Small README fixes
 2023-03-04 15:19:23 +01:00
David Heinemeier Hansson e160b29693 Merge pull request #72 from kjellberg/patch-1 
Update CONTRIBUTING.md
 2023-03-04 08:50:03 +01:00
David Heinemeier Hansson 8ef88859ec Build image on push 2023-03-04 08:23:24 +01:00
David Heinemeier Hansson 9c8bbb8640 Merge pull request #73 from kjellberg/dockerfile 
Create Dockerfile
 2023-03-04 08:18:48 +01:00
David Heinemeier Hansson 78927aa7a2 Create CONTRIBUTING.md 2023-03-03 15:00:56 +01:00
David Heinemeier Hansson cec3468f50 Merge pull request #64 from jimt/typos-1 
Fix typos
 2023-03-02 10:26:52 +01:00
David Heinemeier Hansson f9d6ffa746 Merge pull request #59 from lvnilesh/patch-1 
add bitwarden erb for mrsk envify
 2023-03-01 09:09:02 +01:00
David Heinemeier Hansson 8c8deb2e13 Update README.md 2023-03-01 09:05:22 +01:00
David Heinemeier Hansson fcf226f790 Bump version for 0.8.4 2023-02-27 12:59:58 +01:00
David Heinemeier Hansson 2004cdaa0d Fix test 2023-02-27 12:59:41 +01:00
David Heinemeier Hansson b8413b3ab5 Recover README changes 
Force push bad 😄
 2023-02-26 11:34:32 +01:00
David Heinemeier Hansson 701f6ff237 Move sleep note out of host loop, so we only see it once 2023-02-26 11:27:19 +01:00
David Heinemeier Hansson 27279c6c82 Accessories can individually ask for confirmation 2023-02-23 15:41:49 +01:00
David Heinemeier Hansson 08dd468d87 Bump version for 0.8.3 2023-02-23 15:34:18 +01:00
David Heinemeier Hansson 9a4f502cc4 Pass confirmed flag to accessories 2023-02-23 15:31:56 +01:00
David Heinemeier Hansson 11e6f7914d Merge pull request #56 from mrsked/more-resilient-zero-downtime-deploy 
Start before stopping and longer timeouts
 2023-02-23 12:24:06 +01:00
David Heinemeier Hansson bc6963e6bf Note that rebooting may cause air gap 2023-02-23 12:16:58 +01:00
David Heinemeier Hansson f4f2b5cb17 Communicate the readiness delay 2023-02-23 12:04:57 +01:00
David Heinemeier Hansson 817336df49 No readiness delay in testing 2023-02-23 12:03:03 +01:00
David Heinemeier Hansson 4c399a74bb Update to match latest 2023-02-23 12:02:56 +01:00