Watch initial sync #12047
Merged
Watch initial sync #12047
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jhrotko
force-pushed
the
watch-initial-sync
branch
2 times, most recently
from
b13abd1
to
bb2d745
Compare
jhrotko
commented
Aug 6, 2024
| @@ -574,3 +585,114 @@ func (s *composeService) pruneDanglingImagesOnRebuild(ctx context.Context, proje | |||
| } | |||
| } | |||
| } | |||
|
|
|||
| func (s *composeService) initialSync(ctx context.Context, project *types.Project, service types.ServiceConfig, trigger types.Trigger, ignore watch.PathMatcher, syncer sync.Syncer) error { | |||
| dockerFileIgnore, err := watch.NewDockerPatternMatcher("/", []string{"Dockerfile", "*compose*.y*ml"}) | |||
There was a problem hiding this comment.
is there a better way to handle all the compose.yaml variations pattern? For instance, tried compose.y[a]?ml but it did not work :(
jhrotko
force-pushed
the
watch-initial-sync
branch
3 times, most recently
from
fe051f9
to
a60e6d9
Compare
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
jhrotko
force-pushed
the
watch-initial-sync
branch
2 times, most recently
from
d7bca14
to
8a90c06
Compare
Signed-off-by: Joana Hrotko <joana.hrotko@docker.com>
jhrotko
force-pushed
the
watch-initial-sync
branch
from
8a90c06
to
8567fb7
Compare
jhrotko
commented
Aug 6, 2024
| } | ||
|
|
||
| // gets the image creation time for a service | ||
| func (s *composeService) imageCreatedTime(ctx context.Context, project *types.Project, serviceName string) (time.Time, error) { |
There was a problem hiding this comment.
possibly can be moved somewhere else more generic
ndeloof
approved these changes
Aug 8, 2024
tmeijn
pushed a commit
to tmeijn/dotfiles
that referenced
this pull request
Aug 20, 2024
This MR contains the following updates: | Package | Update | Change | |---|---|---| | [docker/compose](https://github.com/docker/compose) | patch | `v2.29.1` -> `v2.29.2` | MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot). **Proposed changes to behavior should be submitted there as MRs.** --- ### Release Notes <details> <summary>docker/compose (docker/compose)</summary> ### [`v2.29.2`](https://github.com/docker/compose/releases/tag/v2.29.2) [Compare Source](docker/compose@v2.29.1...v2.29.2) #### What's Changed ##### ✨ Improvements - docs: Update docker compose kill usage [(12041)](docker/compose#12041) - add `x-initSync` to watch to always provide initial [(12047)](docker/compose#12047) ##### 🐛 Fixes - Removes redundant condition from toAPIBuildOptions in build.go [(12009)](docker/compose#12009) - Fix stoping compose process for single container for file change on sync-restart action [(12014)](docker/compose#12014) ##### 🔧 Internal - bump golang `1.21.12` [(12017)](docker/compose#12017) - bump engine and cli to `v27.1.1`, buildx to `v0.16.1` [(12020)](docker/compose#12020) - bump engine and cli to `v27.1.2`, buildx to `v0.16.2` [(12057)](docker/compose#12057) - remove all dependabot update MRs for OTel dependencies [(12006)](docker/compose#12006) - bump golang.org/x/sys `v0.22.0` and gofrs/flock `v0.12.1` [(12018)](docker/compose#12018) #### New Contributors - [@​janbrasna](https://github.com/janbrasna) made their first contribution in [(12041)](docker/compose#12041) - [@​kapurm17](https://github.com/kapurm17) made their first contribution in [(12009)](docker/compose#12009) **Full Changelog**: docker/compose@v2.29.1...v2.29.2 </details> --- ### Configuration 📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined). 🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied. ♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox. 🔕 **Ignore**: Close this MR and you won't be reminded about this update again. --- - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box --- This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate). <!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What I did
Introduce initial sync for
syncandsync+restartactions indevelop.watchconfiguration to solve issue when restarting watch - after adocker compose down- where the container no longer reflects previous changes. This behaviour is triggered when addingx-initialSync: trueto a watch configuration. In order to make this work, it was needed to introduceExtensionstodevelop.watch.triggerincompose-go(check related PR below).The initial sync will evaluate if any file in
develop.watch.pathwas modified after the image creation time. It also ignores files fromdevelop.watch.ignorepaths and binded volumes.Related issue
compose-go
fixes
watchsyncdoes not pass project files to container / does not reflect file changes between container restarts #11102(not mandatory) A picture of a cute animal, if possible in relation to what you did
