David Heinemeier Hansson
19104cafb4
Merge branch 'main' into role-awareness
2023-03-21 08:20:26 -04:00
Samuel Sieg
1bdfc217c4
Merge branch 'main' into global-logging-config
2023-03-21 13:20:12 +01: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
790be0f5f3
Style
2023-03-21 12:42:04 +01:00
David Heinemeier Hansson
49d60a045a
Style
2023-03-21 12:41:28 +01: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
Robert Starmer
9591096131
Merge branch 'main' into kumulus/docker-in-docker
2023-03-19 12:34:32 -07:00
Samuel Sieg
b635b3198f
Fix
2023-03-19 09:49:23 +01:00
Samuel Sieg
662873de49
Add logging to README
2023-03-19 09:48:54 +01:00
Samuel Sieg
b5372988f7
Add global logging configuration
2023-03-19 09:21:08 +01:00
Samuel Sieg
c3d0382935
Add another assertion for escape_shell_value
2023-03-17 16:31:10 +01:00
Samuel Sieg
2de5250486
Add tests for Mrsk::Utils
2023-03-17 16:29:25 +01:00
Samuel Sieg
491777221f
Fix destination label filter
2023-03-16 16:15:31 +01: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
Samuel Sieg
dae8b14469
Fix indentation
2023-03-16 08:35:12 +01:00
Samuel Sieg
b166f3fbf4
Don't report exception here too
2023-03-16 08:29:10 +01:00
Samuel Sieg
d33b723afb
Don't report exception
2023-03-16 08:24:54 +01:00
Samuel Sieg
aae290cefc
Add CLI tests for remaining commands that are not tested yet
2023-03-15 16:48:12 +01:00
Stephen van Beek
4c542930c5
Allow arbitrary docker options for traefik
2023-03-15 15:37:10 +00:00
Tobias Bühlmann
a15603655c
Adapt test for single host
2023-03-15 09:28:10 +01:00
Robert Starmer
11af999800
Remove unneeded Dockerfile.dind, update Readme
2023-03-14 16:27:19 -07:00
David Heinemeier Hansson
cb824bdc42
Merge branch 'main' into role-awareness
2023-03-14 19:11:10 -04:00
Yoann Lecuyer
85a0267447
Minor: Properly require active_support
2023-03-14 23:29:00 +01:00
Robert Starmer
886914c82e
Merge branch 'main' into kumulus/docker-in-docker
2023-03-14 14:14:07 -07:00
Robert Starmer
5b506a2daa
add D-in-D dockerfile, update Readme
2023-03-14 14:14:02 -07:00
Stephen van Beek
9843c5e1ce
Fixed typos
2023-03-14 20:13:13 +00:00
Stephen van Beek
c2ca269eb6
Fixed readme
2023-03-14 20:12:11 +00:00
Stephen van Beek
53046efad4
Rebased on main
2023-03-14 20:11:09 +00:00
Stephen van Beek
2db1bfde00
Added volume configuration in response to issue coments
2023-03-14 19:59:19 +00:00
Stephen van Beek
2cea12c56b
Modified in response to PR comments
2023-03-14 19:59:19 +00:00
Stephen van Beek
43a1b42f8c
Added the additional_ports configuration
...
ISSUE: https://github.com/mrsked/mrsk/issues/98
2023-03-14 19:59:19 +00: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
Samuel Sieg
3fd2f3f2c5
Improve comments
2023-03-14 16:05:57 +01:00
Samuel Sieg
46dad1ee6c
Add tests for main CLI commands
2023-03-14 15:58:12 +01:00
Tobias Bühlmann
3ca5bc50b6
Properly pass traefik command options
...
Traefik command options need to be passed as `--key=value`, not `--key value`.
2023-03-14 15:04:33 +01:00
David Heinemeier Hansson
b668ce3f25
Merge pull request #111 from calmyournerves/deploy-without-build-push
2023-03-14 07:32:27 -04:00
David Heinemeier Hansson
253d4ac37b
Merge pull request #115 from intrip/fix-traefik-default-middleware
2023-03-14 07:31:20 -04:00
Jacopo
50ee954ca9
Fix Traefik retry middleware
...
As per [Traefik docs](https://doc.traefik.io/traefik/middlewares/overview/#configuration-example )
a middleware to be activated needs to be applied to a route. Change the default settings
to apply the `retry` middleware on every role with Traefik enabled.
2023-03-14 12:15:00 +01:00
Samuel Sieg
0ac2cd2a4b
Add tests for deploy/redeploy commands
2023-03-14 11:49:31 +01:00
Tobias Bühlmann
72e0184e9f
Fix failing tests
2023-03-13 17:36:02 +01:00
Samuel Sieg
577cf2cec9
Merge branch 'main' into deploy-without-build-push
2023-03-13 16:11:38 +01:00
Samuel Sieg
5010850b86
Merge branch 'main' into deploy-without-build-push
2023-03-13 16:10:31 +01: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
Samuel Sieg
c29d1ddeba
Fix
2023-03-13 16:05:21 +01:00
Samuel Sieg
cb15800d25
Move option to deploy/redeploy, rename to skip-push
2023-03-13 16:02:24 +01:00
