Donal McBreen
26b1d57c90
Install docker with curl or wget
...
If curl is not available to download the docker install script, try
with wget instead.
If neither is available or both fail, return a simple failing script
so that we don't carry on regardless.
Fixes: https://github.com/basecamp/kamal/issues/395
2024-03-07 10:16:03 +00:00
Donal McBreen
b94199415f
Convert combine by: '||' to any
2024-03-07 09:10:49 +00:00
Trevor Vallender
f69c45b7ea
Add docker-setup hook
...
This allows the user to make any necessary configuration changes to
Docker before setting up any containers, allowing those configuration
changes to take effect from the outset.
2024-03-06 19:01:48 +00:00
Donal McBreen
32a2ae5b2c
Merge pull request #708 from nickhammond/valid_service_name
...
Remove warning for valid service name
2024-03-06 16:22:04 +00:00
Nick Hammond
37544a6383
Merge branch 'basecamp:main' into valid_service_name
2024-03-06 09:09:13 -07:00
Nick Hammond
a1bc6d61af
Switch the regex ordering for hyphen and underscore for service name to remove warning
2024-03-06 09:08:17 -07:00
Donal McBreen
5c32be10f1
Merge pull request #707 from basecamp/boot-strategy-min-limit-1
...
Ensure a minimum limit of 1 for % boot strategy
2024-03-06 16:06:35 +00:00
Donal McBreen
dc5af03593
Update tests to match single quotes
2024-03-06 16:04:31 +00:00
Donal McBreen
1abd029ea0
Merge pull request #696 from dorianmariecom/patch-1
...
Replace \`service\` by 'service' so it doesn't get executed by bash
2024-03-06 16:04:11 +00:00
Donal McBreen
c4d0d3e5eb
Merge pull request #704 from basecamp/escape-registry-username-password
...
Escape the docker registry username and password
2024-03-06 15:58:46 +00:00
Donal McBreen
46e7cf8e78
Merge pull request #706 from basecamp/kamal-remove-noop
...
Ensure `kamal remove` completes without setup
2024-03-06 15:58:34 +00:00
Donal McBreen
c7cfc074b6
Ensure a minimum limit of 1 for % boot strategy
...
Fixes: https://github.com/basecamp/kamal/issues/681
2024-03-06 15:51:35 +00:00
Donal McBreen
c10f43e365
Merge pull request #692 from nickhammond/valid_service_name
...
Add a simple validation to the service name to prevent setup issues
2024-03-06 15:24:39 +00:00
Donal McBreen
8e2184d65e
Ensure kamal remove completes without setup
...
If `kamal setup` has not run or errored out part way through,
`kamal remove` should still complete.
Fixes: https://github.com/basecamp/kamal/issues/629
2024-03-06 14:59:26 +00:00
Donal McBreen
2be397b679
Escape the docker registry username and password
...
Fixes: https://github.com/basecamp/kamal/issues/278
2024-03-06 11:04:55 +00:00
Donal McBreen
cc8c508556
Merge branch 'main' into valid_service_name
2024-03-05 11:02:33 +00:00
Nick Hammond
3b16e047c5
Add hyphen to the allowed character list for service name
2024-03-04 10:03:22 -07:00
Donal McBreen
6563393d9a
Merge pull request #627 from aishek/626-mention-sprockets-config-in-deploy-template
...
Mention Sprockets config in deploy template
2024-03-04 15:31:41 +00:00
Ahmed Al Hafoudh
91f350fcce
Merge branch 'basecamp:main' into main
2024-03-04 16:22:28 +01:00
Nick Lozon
e4e9664049
use double quotes
2024-03-04 10:10:51 -05:00
Nick Lozon
1acef5221f
test deep_merge
2024-03-04 10:06:30 -05:00
Nick Lozon
788a57e85e
role logging_args method, use in app
2024-03-04 10:06:30 -05:00
Nick Lozon
f9a934a01f
configuration logging accessor
2024-03-04 10:06:30 -05:00
Aleksandr Borisov
f286fdc374
Update lib/kamal/cli/templates/deploy.yml
...
Co-authored-by: Donal McBreen <dmcbreen@gmail.com >
2024-03-04 16:26:11 +03:00
Donal McBreen
828cca322b
Merge pull request #650 from basecamp/retained-containers
...
Config the number of containers to keep
2024-03-04 12:05:35 +00:00
Donal McBreen
cb030e8751
Merge pull request #680 from igor-alexandrov/traefik-2.10
...
Bump default Traefik image to 2.10
2024-03-04 11:58:37 +00:00
Donal McBreen
6892abb4be
Config the number of containers to keep
...
By default we keep 5 containers around for rollback. The containers
don't take much space, but the images for them can.
Make the number of containers to retain configurable, either in the
config with the `retain_containers` setting on the command line
with the `--retain` option.
2024-03-04 11:55:45 +00:00
Donal McBreen
bcfd0ca88a
Merge pull request #645 from juan-apa/fix-missing-netscp-require
...
require missing net/scp dependency
2024-03-04 11:49:43 +00:00
Donal McBreen
2e8071a5b3
Merge pull request #608 from CleverFew/fix_accessory_cli_host_params
...
Accessory CLI respects `--hosts`
2024-03-04 11:31:50 +00:00
Donal McBreen
200e2686fd
Merge pull request #506 from rience/custom-acc-service-name
...
Allow for Custom Accessory Service Name
2024-03-04 10:57:10 +00:00
Donal McBreen
db94789dc1
Merge pull request #434 from rience/ssh-agent-support
...
Supports Passing SSH Agent Socket to Build Options
2024-03-04 10:54:47 +00:00
Dorian Marié
2bffc3bc74
Replace \service\ by 'service' so it doesn't get executed by bash
...
Fixes #694
2024-03-01 09:54:06 +01:00
Aleksandr Nigomatulin
064ace0598
Rollback passing invoke_options
2024-02-24 21:36:20 +06:00
Nick Hammond
a02af74dda
Add a simple validation to the service name to prevent setup issues
2024-02-22 09:47:48 -07:00
Aleksandr Nigomatulin
5ef384d666
Add test
2024-02-17 00:11:03 +06:00
Aleksandr Nigomatulin
b94dfe193b
Remove unnecessary code
2024-02-16 12:52:07 +06:00
Aleksandr Nigomatulin
bc6c027315
Upds according remarks
2024-02-16 11:56:58 +06:00
Krzysztof Adamski
1c2a45817a
Supports Passing SSH Args to Build Options
2024-02-15 14:20:20 +01:00
Krzysztof Adamski
b411356409
Allow for Custom Accessory Service Name
2024-02-15 11:12:18 +01:00
Igor Alexandrov
77e72e34ce
Bumped default Traefik image to 2.10
2024-02-13 16:00:02 +04:00
Daniel Jackson
ad04bb7556
Show context for lock status message on raise_if_locked
2024-01-23 09:17:15 +01:00
Daniel Jackson
1ec69d3764
Tell user about 'kamal lock help' when deploy fails due to a lock
2024-01-23 09:16:09 +01:00
Daniel Jackson
2d1a0dc9ba
Informative message on lock error
2024-01-22 09:11:17 +01:00
Juan Aparicio
c984db152f
require missing net/scp dependency
2024-01-11 17:00:13 -03:00
David Heinemeier Hansson
aea55480ad
Merge pull request #640 from basecamp/local-different-arch
...
Allow local builds using a different arch than native
2024-01-10 13:28:37 -08:00
dhh
5a09aa12ba
Allow local builds using a different arch than native
2024-01-10 13:00:48 -08:00
Donal McBreen
aca7796e9d
Bump version for 1.3.1
2024-01-10 08:56:34 +00:00
Donal McBreen
8b6d8306d1
Merge pull request #637 from basecamp/tests-wait-longer-for-health
...
Be a bit more patient during tests
2024-01-09 16:45:28 +00:00
Donal McBreen
bb50546467
Merge pull request #636 from basecamp/tests-clean-known-hosts
...
Fix Net::SSH::HostKeyMismatch between bin/test runs
2024-01-09 16:45:12 +00:00
Donal McBreen
acc6b9ad71
Merge pull request #635 from basecamp/missing-base64-require
...
Add a missing base64 require
2024-01-09 16:44:42 +00:00
