spacebar/kamal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,102 Commits 34 Branches 83 Tags
0dcebe7d34f2ab7c347d52fd6447b8d8ffd50073
Commit Graph

1102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Matt Robinson
21b13bf8d3 Add support for proxy_command to run_over_ssh 2023-06-16 08:22:10 -03:00
David Heinemeier Hansson
6e6f696717 Merge pull request #335 from mrsked/specify-min-version 
Add a minimum version setting
 2023-06-16 10:02:40 +02:00
Donal McBreen
98c12a254e Add a minimum version setting 
Allow a minimum MRSK version to be specified in the config.
 2023-06-15 14:53:03 +01:00
Donal McBreen
f0301d2007 Merge pull request #328 from igor-alexandrov/319-override-default-traefik-args 
Added ability to override default Traefik command line arguments
 2023-06-15 14:49:56 +01:00
Igor Alexandrov
d3f5e9efe8 Updated Traefik CLI test 2023-06-15 17:11:20 +04:00
Igor Alexandrov
d9b3fac17a Added ability to override default Traefik command line arguments 2023-06-15 15:41:20 +04:00
Donal McBreen
cd5c41ddbe Merge pull request #334 from basecamp/fix-ssh-symlink 
Fix ssh symlink
 2023-06-15 12:14:30 +01:00
Donal McBreen
a14c6141e5 Dump container logs on failure 2023-06-15 12:05:50 +01:00
Donal McBreen
95d6ee5031 Remove /root/.ssh before symlinking 
Ensure the symlinks are created correctly whether or not /root/.ssh
already exists.
 2023-06-15 12:02:56 +01:00
David Heinemeier Hansson
80a4ca4f8a Merge pull request #331 from basecamp/fix-sample-pre-deploy-hook 
Fix up the sample pre-deploy hook
 2023-06-12 14:09:29 +02:00
Donal McBreen
12ca865e71 Fix up the sample pre-deploy hook 
- Fix the shebang
- Extract a GithubStatusChecks class
 2023-06-12 12:47:51 +01:00
David Heinemeier Hansson
66b4a0ea40 Bump version for 0.13.2 v0.13.2 2023-06-01 12:54:06 +02:00
David Heinemeier Hansson
04b39ea798 Fix spelling 2023-05-31 18:15:21 +02:00
David Heinemeier Hansson
ae55a7b5d8 Merge pull request #325 from mrsked/revert-324-fix-filename-typo 
Revert "Fix typo in fixture filename"
 2023-05-31 18:14:51 +02:00
David Heinemeier Hansson
601cfbd95e Revert "Fix typo in fixture filename" 2023-05-31 18:14:43 +02:00
David Heinemeier Hansson
9fdc85c2e6 Merge pull request #324 from basecamp/fix-filename-typo 
Fix typo in fixture filename
 2023-05-31 18:13:11 +02:00
Donal McBreen
222eda6085 Fix typo in fixture filename 
Following on from https://github.com/mrsked/mrsk/pull/320, fix the
fixture filename as well
 2023-05-31 17:11:13 +01:00
David Heinemeier Hansson
504a09ef1d Merge pull request #318 from basecamp/pre-deploy-hook 
Add a pre-deploy hook
 2023-05-31 17:59:46 +02:00
David Heinemeier Hansson
5a25f073f7 Merge pull request #320 from jsoref/spelling 
Spelling
 2023-05-31 17:59:18 +02:00
David Heinemeier Hansson
c8f521c0e8 Merge pull request #323 from basecamp/prefix-docker-host-with-real-host 
Prefix container hostname with the underlying one
 2023-05-31 17:58:55 +02:00
Donal McBreen
28d6a131a9 Prefix container hostname with the underlying one 
To make it easier to identity where a docker container is running,
prefix its hostname with the underlying one from the host.

Docker chooses a 12 character random hex string by default, so we'll
keep that as the suffix.
 2023-05-31 16:22:25 +01:00
David Heinemeier Hansson
3a9075b8ba Merge pull request #321 from basecamp/more-robust-image-pruning 2023-05-31 13:02:48 +02:00
Donal McBreen
079d9538bb Improve image pruning robustness 
If you different images with the same git SHA, on the second deploy the
tag is moved and the first image becomes untagged. It may however still
be attached to an existing container.

To handle this:
1. Initially prune dangling images - this will remove any untagged
images that are not attached to an existing image
2. Then filter out the untagged images when deleting tagged images - any
that remain will be attached to a container.

The second issue is that `docker container ls -a --format '{{.Image}}`
will sometimes return the image id rather than a tag. This means that
the image doesn't get filtered out when we grep to remove the active
images.

To fix that we'll grep against both the image id and repo:tag.
 2023-05-31 10:17:52 +01:00
Josh Soref
8e94c21729 spelling: with 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
b536fcfa43 spelling: percentage 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
85005be07f spelling: message 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
fc00392d68 spelling: installed 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
fe9affa349 spelling: healthchecks 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
3ecb3a4bfc spelling: guidelines 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
787812cdc2 spelling: every time 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Josh Soref
91fb85d6b5 spelling: etc. 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
 2023-05-29 20:46:34 -04:00
Donal McBreen
db0bf6bb16 Add a pre-deploy hook 
Useful for checking the status of CI before deploying. Doing this at
this point in the deployment maximises the parallelisation of building
and running CI.
 2023-05-29 16:06:41 +01:00
David Heinemeier Hansson
de2de19434 Merge pull request #315 from basecamp/prune-unused-images 
Prune unused images correctly
 2023-05-29 11:42:49 +02:00
David Heinemeier Hansson
f9fbebaa72 Merge pull request #316 from f440/fix-typo 
Fix typo
 2023-05-29 11:42:26 +02:00
Donal McBreen
1e300f3798 Wait longer for app to come up 2023-05-29 08:31:19 +01:00
f440
0373f6c4de Fix typo 2023-05-27 16:27:19 +09:00
Donal McBreen
9037088f99 Increase nginx timeouts in load balancer 2023-05-25 17:31:20 +01:00
Donal McBreen
ff7a1e6726 Prune unused images correctly 
dangling=true doesn't prune any images, as we are not creating dangling
images.

Using --all should remove unused images, but it considers the Git SHA
tag on the latest image to be unused (presumably because there are two
tags, the SHA and latest and the running container is only considered to
be using "latest"). As a result it deletes the tag, which means that we
can't rollback to that SHA later.

Its a bit more complicated to only remove images that are not referenced
by any containers.

First we find the tags we want to keep from the containers (running and
stopped).

Then we append the latest tag to that list.

Then we get a full list of image tags and remove those tags from that
list (using `grep -v -w`).

Finally we pass the tags to `docker rmi`. That either deletes the tag if
there are other references to the image or both the tag and the image if
it is the only one.
 2023-05-25 17:16:46 +01:00
David Heinemeier Hansson
602aa43496 Bump version for 0.13.1 v0.13.1 2023-05-25 14:04:29 +02:00
David Heinemeier Hansson
e35334e5fe Merge pull request #313 from basecamp/stop-restarting-containers 
Stop containers with restarting status
 2023-05-25 14:04:09 +02:00
Donal McBreen
cedb8d900f Stop containers with restarting status 
When stopping the old container we need to also look for ones with a
restarting status.
 2023-05-25 12:10:26 +01:00
David Heinemeier Hansson
8f0b7829ce Bump version for 0.13.0 v0.13.0 2023-05-25 12:05:04 +02:00
David Heinemeier Hansson
57e4f08c4c Merge pull request #308 from tannakartikey/hooks_small_fix 
Hooks sample files typo fix
 2023-05-25 09:02:25 +02:00
David Heinemeier Hansson
a8bfe90fbe Merge pull request #312 from shafy/docs_docker_setup 
docs: change intro command to mrsk setup
 2023-05-25 09:01:04 +02:00
David Heinemeier Hansson
f114dd71f6 Merge pull request #311 from basecamp/pre-connect-hook 
Add a pre-connect hook
 2023-05-25 08:58:19 +02:00
Can Olcer
d1b5b9cf7a docs: change intro command to mrsk setup 2023-05-24 20:32:41 +02:00
Donal McBreen
66f9ce0e90 Add a pre-connect hook 
This can be used for hooks that should run before connecting to remote
hosts. An example use case is pre-warming DNS.
 2023-05-24 14:39:30 +01:00
Kartikey Tanna
956ab3560b Hooks typo fix 2023-05-23 22:12:49 +05:30
David Heinemeier Hansson
483b893018 Merge pull request #291 from basecamp/hooks 
MRSK Hooks
 2023-05-23 17:07:04 +02:00
Donal McBreen
19f0f40adf Add skip_hooks option 2023-05-23 15:56:47 +01:00