spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,830 Commits 34 Branches 83 Tags
2e7d0ddc448e2930e4ed0f704f6a2c2e3127fa29
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Donal McBreen 2e7d0ddc44 Merge pull request #1358 from basecamp/dont-run-assets-container 
Create but don't run the assets container
 2025-01-17 08:09:01 +00:00
Donal McBreen ab8396fbb2 Merge pull request #1032 from basecamp/set-config-file-and-deploy-in-aliases 
Allow destination and config-file in aliases
 2025-01-17 08:07:06 +00:00
Donal McBreen 063dfd9edd Merge pull request #1296 from basecamp/fix-for-dotenv-1.3.5 
Fix for Dotenv 3.1.5
 2024-12-13 10:54:16 +00:00
Donal McBreen d9c25533e4 Merge pull request #1292 from nickhammond/aws-secrets-manager-simple 
Aws secrets manager simple strings and error checking
 2024-12-13 09:45:52 +00:00
Donal McBreen d5ec0e6ad2 Merge pull request #1291 from nickhammond/remove-grep-options-alias 
Remove the alias for grep_options, issues processing with thor
 2024-12-13 09:44:06 +00:00
Donal McBreen 495b3cd95f Merge pull request #1270 from basecamp/kamal-proxy-0.8.4 
Update to proxy version 0.8.4
 2024-12-03 12:15:00 +00:00
Donal McBreen b04e8cd8d7 Merge pull request #1272 from basecamp/dependabot/bundler/bundler-7ec3bf8405 
Bump rails-html-sanitizer from 1.6.0 to 1.6.1 in the bundler group across 1 directory
 2024-12-03 12:14:47 +00:00
Donal McBreen fbc4515888 Merge pull request #906 from aliismayilov/detached-run 
Allow running detached app commands and follow logs by container ID
 2024-12-02 10:22:45 +00:00
Donal McBreen 99829092b3 Merge pull request #1229 from matjack1/use-ssh-keys-when-executing-commands 
[FIX] - Make kamal use ssh keys from config when performing commands
 2024-12-02 09:59:03 +00:00
Donal McBreen 084d1d4a1d Merge pull request #1253 from AxelTheGerman/proxy-0.8.3 
Bump proxy minimum version to 0.8.3
 2024-12-02 09:54:33 +00:00
Donal McBreen 69867e2650 Merge pull request #981 from igor-alexandrov/proxy-accessories 
Proxy for accessories
 2024-11-26 09:51:22 +00:00
Donal McBreen b9804a07aa Merge pull request #1239 from matjack1/output-accessory 
Add support for exec output in accessories
 2024-11-21 16:57:17 +00:00
Donal McBreen f4d98bb67a Merge pull request #1225 from matthewbjones/feature/sbom-attestations 
Adds support for SBOM attestations
 2024-11-21 16:21:41 +00:00
Donal McBreen 42c3425411 Merge pull request #1235 from basecamp/support-line-filtering 
Support line filtering when running tests
 2024-11-21 15:26:25 +00:00
Donal McBreen 57e48a33bb Merge pull request #1141 from justindell/feat-add-aws-secrets-manager-adapter 
feat: add secrets adapter for aws secrets manager
 2024-11-21 15:03:54 +00:00
Donal McBreen 4acb78fff6 Merge pull request #1099 from mrbongiolo/feat-secrets-add-doppler-adapter 
feat(secrets): add Doppler adapter
 2024-11-21 15:03:36 +00:00
Donal McBreen 1a86b3ae6e Merge pull request #1196 from tiramizoo/role-accessories-msg 
Improve error on unknown role in accessories config.
 2024-11-21 15:02:48 +00:00
Donal McBreen a4ab34d8d9 Merge pull request #1170 from davidstosik/sto/spaces 
Remove trailing spaces from deploy.yml template
 2024-11-21 14:52:35 +00:00
Donal McBreen 24d03fd60e Merge pull request #1105 from igor-alexandrov/ruby-version-example 
Updated deploy.yml template to fetch the Ruby version automatically
 2024-11-21 14:50:11 +00:00
Donal McBreen 9cf8da64c4 Merge pull request #1193 from basecamp/filter-by-no-destination 
Filter correctly for empty destinations
 2024-11-04 11:14:42 +00:00
Donal McBreen ca5e53404b Merge pull request #1175 from basecamp/proxy-0.8.2 
Bump proxy minimum version to 0.8.2
 2024-10-31 08:13:18 +00:00
Donal McBreen 2465681408 Merge pull request #1151 from basecamp/net-ssh-7.3.0 
Ensure using at least net-ssh 7.3.0
 2024-10-25 16:16:18 +01:00
Donal McBreen b917d7cd40 Merge pull request #1152 from basecamp/skip-log-max-size 
Allow log max size to not be set
 2024-10-25 08:55:18 +01:00
Donal McBreenandSijawusz Pur Rahnama 1980a79e73 Update lib/kamal/cli/proxy.rb 
Co-authored-by: Sijawusz Pur Rahnama <sija@sija.pl>
 2024-10-25 08:10:25 +01:00
Donal McBreen 347eb69350 Merge pull request #994 from honzasterba/bw_fetch_all_fields 
[bitwarden] ability to fetch all fields from an item
 2024-10-23 16:32:39 +01:00
Donal McBreen 57d582e3bc Merge pull request #972 from kohkimakimoto/dev-provenance-flag 
Add provenance option
 2024-10-23 14:07:19 +01:00
Donal McBreen bf8779cef4 Merge pull request #950 from admtnnr/fix-registry-cache-options 
builder/cache/options: fix order of build args when using registry
 2024-10-23 13:59:59 +01:00
Donal McBreen 0f97e0b056 Merge pull request #1114 from alanoliveira/main 
prevent escape '#' when generating env_file string
 2024-10-23 12:35:07 +01:00
Donal McBreen bd8c35b194 Merge pull request #1020 from igor-alexandrov/network-args 
Allow to override network
 2024-10-23 12:22:36 +01:00
Donal McBreen 35075e2e4d Merge pull request #1136 from aidanharan/secrets-files-not-found-message 
Updated secrets error message if secrets files do not exist
 2024-10-23 11:14:41 +01:00
Donal McBreen 53dad5f54f Merge pull request #1121 from kylerippey/adapter-cli-installation-checks 
Raise meaningful error messages when secret adapter CLIs are not installed
 2024-10-23 11:12:50 +01:00
Donal McBreen 66f6e8b576 Merge pull request #1045 from junket/allow-false-env-var-value 
Allow false env var value
 2024-10-23 11:11:43 +01:00
Donal McBreen a3e5505bb2 Merge pull request #1117 from pardeyke/add_proxy_reboot_info 
Added `kamal proxy reboot` to raised error message
 2024-10-22 17:26:36 +01:00
Donal McBreen fdf8ef1343 Merge pull request #1144 from basecamp/zeitwerk-2.7 
Require zeitwerk 2.6.18
 2024-10-22 15:03:45 +01:00
Donal McBreen 493c5690f1 Merge pull request #1066 from davidstosik/v2.1.1/path-space-fix 
Support spaces in git repository path
 2024-10-10 10:17:00 -04:00
Donal McBreen 5de55a22ff Merge pull request #1088 from emmceemoore/patch-1 
Typo fix.
 2024-10-10 10:16:01 -04:00
Donal McBreen 6a7783c979 Merge pull request #1086 from basecamp/proxy-1.8.1 
Bump proxy to version 0.8.1
 2024-10-09 14:46:09 -04:00
Donal McBreen 7dc2609b77 Merge pull request #1082 from graysonchen/patch-1 
ERROR (ArgumentError): Unknown boot_config subcommand clear
 2024-10-09 14:03:07 -04:00
Donal McBreen 91df935d05 Merge pull request #1076 from basecamp/active-support-require-for-to-sentence 
Add Active Support require for to_sentence
 2024-10-08 07:46:53 -04:00
Donal McBreen bbfcbfa94b Merge pull request #1064 from basecamp/kamal-proxy-0.8.0 
Update to kamal-proxy 0.8.0
 2024-10-08 07:42:48 -04:00
Donal McBreen 440044b900 Merge pull request #1072 from basecamp/proxy-default-10m-logs 
Default to keeping 10m of proxy logs
 2024-10-08 07:35:38 -04:00
Donal McBreen 23898a5197 Merge pull request #1062 from basecamp/skip-proxy-flag-ssl-false 
Skip setting the proxy flag when ssl is false
 2024-10-06 18:32:45 +01:00
Donal McBreen aa15fa532a Merge pull request #1024 from jeromedalbert/follow-primary-role 
Follow logs on primary role by default
 2024-10-02 09:29:16 +01:00
Donal McBreen 276b469c2b Merge pull request #1019 from nickhammond/ENV/destination 
Set KAMAL_DESTINATION when loading config
 2024-10-02 09:28:01 +01:00
Donal McBreen c10b3fb07a Merge pull request #908 from basecamp/ignorable-ssh-config 
SSH: allow setting `config: false` to ignore local user `~/.ssh/config`
 2024-10-02 08:28:57 +01:00
Donal McBreen cd12f95a97 Merge pull request #1018 from basecamp/kamal-proxy-deploy-equals-in-args 
Use `=` in kamal-proxy deploy command args
 2024-10-01 15:51:43 +01:00
Donal McBreen b4bcf35f78 Merge pull request #1000 from kpumuk/hosts 
Allow specifying multiple hosts for kamal-proxy via an array
 2024-09-30 10:26:15 -04:00
Donal McBreen 7f6095c9eb Merge pull request #1009 from basecamp/secrets-print 
Add `kamal secrets print` for secret debugging
 2024-09-30 09:55:53 -04:00
Donal McBreen ef1271df47 Merge pull request #1010 from basecamp/kamal-proxy-0-7-0 
Added support for ACME `http-01` challenges
 2024-09-30 09:55:34 -04:00
Donal McBreen af992ce755 Merge pull request #996 from iximiuz/patch-1 
Fix git --add safe.directory command in Dockerfile
 2024-09-30 04:36:00 -04:00
Donal McBreen 32caf4b148 Merge pull request #995 from honzasterba/bw_nicer_error_message_on_non_field_fetch 
[bitwarden] default fetch raises NoMethodError
 2024-09-30 04:35:48 -04:00
Donal McBreen 28a02262df Merge pull request #988 from igor-alexandrov/kamal-proxy-remove-no-target 
Fixed kamal-proxy remove command
 2024-09-30 04:18:12 -04:00
Donal McBreen b11fb93a6c Merge pull request #971 from igor-alexandrov/add-app-port-example 
Added app_port example to the proxy section
 2024-09-30 04:16:34 -04:00
Donal McBreen 5036f8843f Merge pull request #986 from basecamp/rails-8-requires-ruby-3.2 
Rails 8 doesn't support Ruby 3.1
 2024-09-27 08:23:32 -04:00
Donal McBreen ae990efd02 Merge pull request #978 from basecamp/ignore-ssl-false 
Handle ssl: false in proxy config
 2024-09-26 11:56:00 +01:00
Donal McBreen 325bf9a797 Merge pull request #975 from basecamp/kamal-proxy-0.6.0 
Bump to latest version of kamal-proxy
 2024-09-25 23:03:25 +01:00
Donal McBreen 7633fe0293 Merge pull request #974 from basecamp/proxy-boot-config 
Proxy boot config
 2024-09-25 20:28:24 +01:00
Donal McBreen 4d8387b1c9 Merge pull request #973 from eroluysal/main 
Fix adapter names
 2024-09-25 19:48:40 +01:00
Donal McBreen ab109afc52 Merge pull request #957 from basecamp/numeric-timeouts 
Response timeout should be a number
 2024-09-20 09:50:05 +01:00
Donal McBreen 56e90906b1 Merge pull request #954 from basecamp/two-app-integration-test 
Integration test two apps
 2024-09-19 16:36:45 +01:00
Donal McBreen 85f1e14b97 Merge pull request #953 from basecamp/inherit-env-for-secrets 
Avoid setting env via SSHKit
 2024-09-19 15:18:31 +01:00
Donal McBreen 45a58f7e15 Merge pull request #952 from basecamp/app-exec-in-kamal-network 
Run app exec in the kamal network
 2024-09-19 14:46:58 +01:00
Donal McBreen 9fe1821cae Merge pull request #951 from basecamp/proxy-config-ownership 
Fix /home/kamal-proxy/.config/kamal-proxy ownership
 2024-09-19 12:57:10 +01:00
Donal McBreen 3ec4ad2ea5 Merge pull request #949 from basecamp/role-proxy-config 
Allow role specific proxy config
 2024-09-18 18:27:36 +01:00
Donal McBreen 684f7ac148 Merge pull request #948 from basecamp/deploy-drain-timeouts 
Simplified deploy/drain timeouts
 2024-09-18 15:18:00 +01:00
Donal McBreen 600bbd77ef Merge pull request #947 from basecamp/doc-updates 
Update proxy and docs for Kamal 2.0/kamal-proxy 0.3.0
 2024-09-18 14:45:32 +01:00
Donal McBreen e07ac070aa Merge pull request #945 from basecamp/kamal-2-upgrade 
Upgrade on accessory hosts only with correct messages
 2024-09-18 10:27:28 +01:00
Donal McBreen bd54c74682 Merge pull request #944 from basecamp/single-secrets-instance 
Ensure we don't load the secrets more than once
 2024-09-17 14:33:38 +01:00
Donal McBreen 190dbd1ea3 Merge pull request #943 from basecamp/response-timeout-string 
Need a duration string for the response timeout
 2024-09-17 14:14:49 +01:00
Donal McBreen d6eda3d741 Merge pull request #942 from basecamp/kamal-2-upgrade 
Upgrade commands for Kamal 1.x -> 2.0
 2024-09-17 13:34:00 +01:00
Donal McBreen 434490bd0c Merge pull request #940 from basecamp/proxy 
Replace Traefik with kamal-proxy
 2024-09-17 09:47:16 +01:00
Donal McBreen 53903ddcd2 Read buffer not buffering 2024-09-16 16:44:21 +01:00
Donal McBreen 55756fa6f3 Set request and response headers 2024-09-16 16:44:21 +01:00
Donal McBreen fe0c656de5 Split buffer requests/responses 2024-09-16 16:44:21 +01:00
Donal McBreen 418d8045d8 Add forward headers support 2024-09-16 16:44:21 +01:00
Donal McBreen d63ff8f251 Set extra fields 2024-09-16 16:44:21 +01:00
Donal McBreen eab717e0cf Add kamal-proxy in experimental mode 
The proxy can be enabled via the config:

```
proxy:
  enabled: true
  hosts:
    - 10.0.0.1
    - 10.0.0.2
```

This will enable the proxy and cause it to be run on the hosts listed
under `hosts`, after running `kamal proxy reboot`.

Enabling the proxy disables `kamal traefik` commands and replaces them
with `kamal proxy` ones. However only the marked hosts will run the
kamal-proxy container, the rest will run Traefik as before.
 2024-09-16 16:44:19 +01:00
Donal McBreen 66d5e25834 Merge pull request #939 from basecamp/secrets-mutex 
Add a mutex around loading secrets
 2024-09-16 16:26:58 +01:00
Donal McBreen 876eebc7c5 Merge pull request #936 from basecamp/asset-extraction-entrypoint 
Override the entrypoint when extracting assets
 2024-09-13 17:46:43 +01:00
Donal McBreen 045aa7d167 Merge pull request #934 from basecamp/secrets-dont-exit 
Don't exit from failed secrets commands
 2024-09-11 16:27:33 +01:00
Donal McBreen debdf00cca Merge pull request #933 from basecamp/common-secrets 
Add secrets-common for shared secrets
 2024-09-11 14:20:01 +01:00
Donal McBreen c9946808b1 Merge pull request #931 from basecamp/dont-git-ignore-dot-kamal-secrets 
Don't git ignore .kamal/secrets
 2024-09-11 13:26:07 +01:00
Donal McBreen deb2a6d298 Merge pull request #930 from basecamp/hide-1password-login-error 
Hide the 1password login error
 2024-09-11 12:18:09 +01:00
Donal McBreen 63d0b5ddfa Merge pull request #928 from basecamp/kamal-secrets-inline-aware 
Make the secrets commands inline aware
 2024-09-10 11:08:10 +01:00
Donal McBreen 5aa3d1aeb0 Merge pull request #927 from basecamp/revert-903-integration-test-insecure-registry 
Revert "Integration test insecure registry"
 2024-09-10 10:12:57 +01:00
Donal McBreen 7156c80f34 Merge pull request #924 from basecamp/secrets 
Secrets
 2024-09-09 15:13:35 +01:00
Donal McBreenandSijawusz Pur Rahnama b99c044327 Update lib/kamal/cli/templates/secrets 
Co-authored-by: Sijawusz Pur Rahnama <sija@sija.pl>
 2024-09-06 13:25:39 +01:00
Donal McBreen b464c4fd4a Include dotenv upgrade 2024-09-04 09:32:45 +01:00
Donal McBreen 56754fe40c Lazily load secrets whenever needed 2024-09-04 09:32:45 +01:00
Donal McBreen 6a06efc9d9 Strip out env loading, envify, env push 2024-09-04 09:32:45 +01:00
Donal McBreen 5c4c33e0a8 Replace .env* with .kamal/env* 
By default look for the env file in .kamal/env to avoid clashes with
other tools using .env.

For now we'll still load .env and issue a deprecation warning, but in
future we'll stop reading those.
 2024-09-04 09:32:45 +01:00
Donal McBreen 0b5506f6f2 Merge pull request #923 from basecamp/disable-local-builder 
Allow disabling of local builds
 2024-09-03 14:53:23 +01:00
Donal McBreen 9b9e60ec7f Merge pull request #921 from basecamp/remote-hybrid-builders-cleanup 
Build and clean remote builders correctly
 2024-09-02 15:24:28 +01:00
Donal McBreen 6adf3c117f Merge pull request #905 from basecamp/simplify-builders-config 
Simplify builders config
 2024-08-29 09:28:51 +01:00
Donal McBreen 56268d724d Simplify the builders configuration 
1. Add driver as an option, defaulting to `docker-container`. For a
   "native" build you can set it to `docker`
2. Set arch as a array of architectures to build for, defaulting to
   `[ "amd64", "arm64" ]` unless you are using the docker driver in
   which case we default to not setting a platform
3. Remote is now just a connection string for the remote builder
4. If remote is set, we only use it for non-local arches, if we are
   only building for the local arch, we'll ignore it.

Examples:

On arm64, build for arm64 locally, amd64 remotely or
On amd64, build for amd64 locally, arm64 remotely:

```yaml
builder:
  remote: ssh://docker@docker-builder
```

On arm64, build amd64 on remote,
On amd64 build locally:

```yaml
builder:
  arch:
    - amd64
  remote:
    host: ssh://docker@docker-builder
```

Build amd64 on local:

```yaml
builder:
  arch:
    - amd64
```

Use docker driver, building for local arch:

```yaml
builder:
  driver: docker
```
 2024-08-29 08:45:48 +01:00
Donal McBreen cffb6c3d7e Allow the driver to be set 2024-08-29 08:44:11 +01:00
Donal McBreen bd1726f305 docker buildx build -> docker build 2024-08-29 08:44:11 +01:00
Donal McBreen 7ddb122a22 Get tests passing 2024-08-29 08:44:11 +01:00
Donal McBreen 98c951bbdb Simplfy choosing a builder 2024-08-29 08:44:11 +01:00
Donal McBreen 374c117b79 Validate multiarch configuration 
Remote and local are only allowed when multiarch is enabled.
Remote requires a host and arch, local only requires an arch.
 2024-08-29 08:44:11 +01:00