1a41678c58
fix typos
...
Signed-off-by: Jes Cok <xigua67damn@gmail.com>
2023-06-27 16:12:25 +02:00
035276e027
watch: add warning when a path is already used by a bind mount volume ( #10741 )
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-06-26 18:56:04 -04:00
061b52da9a
ci: build fix for new buildx
...
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-06-21 11:17:39 +02:00
04aa155878
ci: upgrade to buildx v0.11
...
https://github.com/docker/buildx/releases/tag/v0.11.0
Several `replace` directives have been removed and dependencies
aligned with buildx as needed.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-06-21 11:17:39 +02:00
2d4f8d31fc
Merge pull request #10709 from ndeloof/secret_uid
...
warn user build.secrets uid,gid,mode are not implemented
2023-06-21 10:19:43 +02:00
a2ce602f6c
fix race condition, waiting for containers when one exit
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-20 16:17:15 +02:00
c61b8aa5ac
introduce run --cap-add to run maintenance commands using service image
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-19 14:20:20 +02:00
7ffe83dc95
don't apply "rebuild" watch strategy by default
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-15 15:30:21 +02:00
d20c2551f2
warn user build.secrets uid,gid,mode are not implemented
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-14 10:21:20 +02:00
cfe91becc7
use `--progress` to configure progress UI stylet push
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-12 16:53:42 +02:00
e63ab14b1e
ci: merge Go coverage reports before upload ( #10666 )
...
Attempting to fix the state of codecov action checks right now,
which are behaving very erratically.
Using the new functionality in Go 1.20 to merge multiple reports,
so now the unit & E2E coverage data reports are stored as artifacts
and then downloaded, merged, and finally uploaded to codecov as a
new job.
Additionally, add a `codecov.yml` config and try to turn down the
aggressiveness of it for CI checks.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-06-08 14:58:21 -04:00
32cf776ecd
Merge pull request #10620 from ndeloof/Building
...
do not render `Building` when no build is needed
2023-06-08 12:16:46 +02:00
955784c406
Merge pull request #10662 from milas/bump-deps
...
ci: upgrade to Go 1.20.5 and Moby v24.x
2023-06-08 12:03:23 +02:00
852c9e80b4
create directory in container using `mkdir -p`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-08 11:28:22 +02:00
37850f7955
ci: upgrade to Go 1.20.5 and Moby v24.x
...
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-06-07 10:41:49 -04:00
4bf2fe9fed
assume we receive logs by lines and don't ignore those without EOL
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-07 10:40:37 +02:00
629c9f62e9
better diagnostic message on network label mismatch
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-05 16:54:58 +02:00
7c3fe359b7
Merge pull request #10622 from ndeloof/logs_follow
...
fix `compose -p x logs -f` detect new services started after command
2023-06-02 09:39:20 +02:00
d2aa15c06e
bump buildx and use confutil.ConfigDir
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-06-01 12:09:13 +02:00
6530880361
Merge pull request #10623 from jfly/jfly/tweak-warning-message
...
Fix typo in warning about existing volume
2023-06-01 08:50:33 +02:00
1bd8a773a7
detect network conflict as name is not guaranteed to be unique ( #10612 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-31 14:46:23 -04:00
fed8ef6b79
forward signal to container
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-31 15:10:11 +02:00
06ec06472f
up should not silently ignore missing depends_on service
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-26 21:59:29 +02:00
466e1d3197
prevent buildkt's progress to render `Building` when no built is needed
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-26 15:04:37 +02:00
0d6b99e6f9
e2e test to cover logs -f managing service being added/scaled
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-26 14:51:23 +02:00
01d91c490c
detect new container from project have started when running `compose logs` with no explicit services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-26 14:15:48 +02:00
6f6e1635fd
compute service hash with a default DeployConfig
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-26 14:15:33 +02:00
3d05a1becf
Fix typo in warning about existing volume
...
Previously, this was telling us "but was not created for project
[project-it-was-created-for]", which is wrong. I opted to make the
message super explicit and print both the actual project and the
expected project.
Signed-off-by: Jeremy Fleischman <jeremyfleischman@gmail.com>
2023-05-25 17:16:47 -07:00
b05a94fd66
progress: remove errant import ( #10614 )
...
Write the warning using `logrus.Warn`. The function being used was
coming from `cfssl`'s log package, which was presumably the result
of auto-import being _slightly_ too aggressive.
(Note: `cfssl` is still an indirect dependency after this.)
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-05-24 17:08:46 -04:00
c7afc6188b
detect conflict removing volume/image and warn user
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-24 17:32:32 +02:00
ca19b7fcc9
introduce WithRootNodesAndDown to walk the graph from specified nodes and down
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-24 17:32:32 +02:00
93bd27a0cc
introduce ability to select service to be stopped by `compose down`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-24 17:32:32 +02:00
68c462e607
scale: sort containers by creation date to remove older ones first ( #10571 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-23 13:58:32 -04:00
916aac6c27
watch: only monitor configured paths ( #10599 )
...
For performance, don't watch the entire build context.
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-23 13:35:50 -04:00
eafcd1b35e
secrets: only set CopyUIDGID when required ( #10598 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-23 13:34:24 -04:00
cfe1a860ff
fix detection of swarm mode
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-22 08:26:22 +02:00
cd0fc214a5
only check the platform of cached image if image found
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-05-17 08:04:54 +02:00
9b5a4588f9
introduce --no-path-resolution to skip relative path to be resolved
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-16 13:02:56 +02:00
00f72cb553
report external network not found when swarm is disabled
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-15 20:57:19 +02:00
18a112e88c
detect terminal is not a `console.File` to avoid a panic
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-15 20:56:33 +02:00
77dc9b54f3
rm: remove debugging output ( #10554 )
...
For example, when no container was being removed,
this would print `[]`.
Signed-off-by: Mateus Esdras <linux.esdras@gmail.com>
2023-05-11 16:32:29 -04:00
bceb3c1876
detect active endpoint trying to remove network and skip with a warning ( #10555 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-11 16:31:29 -04:00
a14abb9044
cli: option to write status messages on stdout ( #10549 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-11 12:45:00 -04:00
0363d9260a
fix local image removal when `compose down` is ran with `--project-name` ( #10558 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-11 12:41:14 -04:00
b776826d92
check local image matches the required platform
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-10 16:57:21 +02:00
e92c5d1392
fix race condition running `compose up` with --parallel < number of services
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-10 11:39:07 +02:00
67455e9f33
fix builkit progressui integration ( #10535 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-08 09:21:41 -04:00
5fdcaa0fe1
Merge pull request #10529 from glours/dry-run-up-support
...
add dry-run support to up command
2023-05-05 09:41:18 +02:00
2e4faf80f5
add dry-run support to up command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-05-04 15:11:11 +02:00
b45ca82791
let user declare build secret target (id)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-05-04 10:01:10 +02:00
b304c4e154
stop containers after termination
...
Signed-off-by: TP-O <letranphong2k1@gmail.com>
2023-05-03 11:47:56 +02:00
eca1365d42
cli: dry run support for `build` ( #10502 )
...
* add dry-run support for classic builder
* add dry-run support for buildkit
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-05-02 14:23:26 -04:00
03f4c0e631
progress: make title configurable ( #10507 )
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-05-02 14:15:35 -04:00
07c4849cb9
TailMsgf must format with args
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-27 22:12:12 +02:00
d01ef5887a
restore support for `--memory`
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-25 15:41:08 +02:00
dec608f3cd
don't block events loop collecting logs
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-25 15:20:05 +02:00
1383ab09ec
test: fix E2E tests under Engine v23 / DD 4.19
...
Some error messages have been tweaked slightly, this adapts the
assertions to work on both Engine v20.10.x and v23.x.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-04-25 08:27:42 +02:00
5eaafe4237
Fixed issue when project name contains dashes (`-`)
...
Signed-off-by: Benjamín Guzmán <bg@benjaminguzman.dev>
2023-04-24 12:18:37 +02:00
7840a92c40
Added tests to `viz` subcommand
...
Signed-off-by: Benjamín Guzmán <bg@benjaminguzman.dev>
2023-04-24 12:18:37 +02:00
65fda18821
bump compose-go
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-17 17:19:56 +02:00
0e7e1b940b
Remove redundant goroutine while removing containers ( #10449 )
...
don't use goroutine to stop container while removing
Signed-off-by: TP-O <letranphong2k1@gmail.com>
2023-04-17 10:57:29 -04:00
af6f0ffb9e
Merge pull request #10458 from thaJeztah/simplify_auth
...
Don't use "info.IndexServerAddress" for authentication
2023-04-12 12:19:04 -04:00
9ef173a3ac
log: fix race on container kill ( #10459 )
...
If we go to inspect a container that we got an event for and it
no longer exists on the server, handle clean up without erroring
out.
Fixes #10373 .
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-04-12 12:15:58 -04:00
1892be8c70
Don't use "info.IndexServerAddress" for authentication
...
The IndexServerAddress field was as part of the initial Windows implementation
of the engine. For legal reasons, Microsoft Windows (and thus Docker images
based on Windows) were not allowed to be distributed through non-Microsoft
infrastructure. As a temporary solution, a dedicated "registry-win-tp3.docker.io"
registry was created to serve Windows images.
Using separate registries was not an ideal solution, and a more permanent
solution was created by introducing "foreign image layers" in the distribution
spec, after which the "registry-win-tp3.docker.io" ceased to exist, and
removed from the engine.
This replaces the code that calls out to the "/info" endpoint to use the
GetAuthConfigKey() function instead.
Related PR in docker/cli:
b4ca1c7368
2023-04-11 23:10:22 +02:00
7fb87856aa
add dry-run support to down command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-04-07 10:41:51 +02:00
cb688b5fd4
fix gocyclo lint error which currently block Compose CI
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-04-07 10:19:06 +02:00
8b5b78fbb6
can't watch a service without a build section
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-06 08:55:49 +02:00
d762f5f473
better support NO_COLOR by disabling colors, not ANSI TUI ( #10434 )
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-04 17:00:10 -04:00
7ce0096f40
ci: bump Go to 1.20.3 and various dependencies
...
Use latest Go minor release. Note: this release included fixes for
several CVEs, but they do not impact Compose.
Small errors have been fixed to keep the linter happy.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-04-04 15:15:02 -04:00
a10c4c6df5
restore `--timeout` flag renamed by mistake
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-04-04 08:48:00 +02:00
6a37428491
Merge pull request #10413 from glours/dry-run-create-support
...
add dry-run support to create command
2023-04-03 18:25:55 +02:00
981cb2024e
prevent panic using classic builder
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-31 11:59:22 +02:00
b83edbd039
add dry-run support to create command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-30 10:25:56 +02:00
c5317496ac
workaround race condition in ContainerList
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-28 12:28:41 +02:00
72a61c0602
add dry-run support to run command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-27 18:57:11 +02:00
d818bf6f34
Merge pull request #10401 from milas/deps-update
...
ci: upgrade to Go 1.20.2 & bump deps
2023-03-24 11:05:53 -04:00
cd17c8a950
test: update error message
...
Validation got improved in `compose-go` so the error message is
slightly different.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-03-24 10:42:43 -04:00
36625ed229
test: fix race in e2e build test
...
This was running two tests in parallel that would build/delete the
same images. Run in serial instead since that's not safe.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-03-24 10:32:55 -04:00
d637cc3ade
watch involves up --build after change has been detected
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-24 10:49:27 +01:00
16d5354d70
watch: add note about goroutine-safety & test
...
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-03-23 11:33:03 -04:00
7aaea283ca
watch: data race / segfault fixes
...
Was getting segfaults with multiple services using
`x-develop` and `watch` at the same time. Turns out
the Moby path matcher lazily initializes the regex
pattern internally the first time it's used, so it's
not goroutine-safe.
Change here is to not use a global instance for the
ephemeral path matcher, but a per-watcher instance.
Additionally, the data race detector caught a couple
other issues that were easy enough to fix:
* Use the lock that's used elsewhere for convergence
before manipulating
* Eliminate concurrent map access when triggering
rebuilds
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-03-22 18:05:56 -04:00
a11515e038
introduce `ignore` attribute for watch triggers
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-21 18:29:49 +01:00
6c1f06e420
Run classic builder with BuildConfig, not buildx.Options
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-21 15:37:55 +01:00
88b0d17ff8
use `build` as common API for build scenarios
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-21 15:37:55 +01:00
9e19bc8441
use progress to show copy status
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-21 14:40:52 +01:00
105a7c5b70
watch: add file delete/rename handling
...
This approach mimics Tilt's behavior[^1]:
1. At sync time, `stat` the path on host
2. If the path does not exist -> `rm` from container
3. If the path exists -> sync to container
By handling things this way, we're always syncing based on the true
state, regardless of what's happened in the interim. For example, a
common pattern in POSIX tools is to create a file and then rename it
over an existing file. Based on timing, this could be a sync, delete,
sync (every file gets seen & processed) OR a delete, sync (by the
the time we process the event, the "temp" file is already gone, so
we just delete it from the container, where it never existed, but
that's fine since we deletes are idempotent thanks to the `-f` flag
on `rm`).
Additionally, when syncing, if the `stat` call shows it's for a
directory, we ignore it. Otherwise, duplicate, nested copies of the
entire path could get synced in. (On some OSes, an event for the
directory gets dispatched when a file inside of it is modified. In
practice, I think we might want this pushed further down in the
watching code, but since we're already `stat`ing the paths here now,
it's a good place to handle it.)
Lastly, there's some very light changes to the text when it does a
full rebuild that will list out the (merged) set of paths that
triggered it. We can continue to improve the output, but this is
really helpful for understanding why it's rebuilding.
[^1]: db7f887b06/internal/controllers/core/liveupdate/reconciler.go (L911)
2023-03-21 08:37:18 -04:00
bfeb1dc277
Fix concurrent map read/write when recreating containers
...
Signed-off-by: Luis Rascao <luis.rascao@gmail.com>
2023-03-19 21:56:06 +01:00
200f47e5be
Add support for `additional_contexts` in `build` service config
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2023-03-15 14:00:51 +01:00
e0aaccf430
introduce dockerfile_inline
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-15 10:19:04 +01:00
754c06886f
one off container name use configured Separator for naming
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-15 09:47:43 +01:00
e492330dd5
collect built image IDs
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-15 09:47:32 +01:00
bbe1b77a67
progress writer uses dockercli.Err stream
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-15 09:47:13 +01:00
85ddfde5d6
use go 1.20 -cover support
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-10 16:54:39 +00:00
6a0398d786
pad can be negative on small terminal
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-09 10:27:43 +00:00
4434cea535
add dry-run support for push command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-08 14:23:57 +00:00
3f7d3c2661
add dry-run support for pull command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-05 22:04:32 +01:00
167c6a89b1
add dry-run support to restart command
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-02 10:14:59 +01:00
3cfbac6624
restart only needed services by checking depends_on relations
...
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
2023-03-01 18:22:40 +01:00
4ea44797f5
only consider containers with config_hash labels (i.e, created by compose)
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2023-03-01 15:46:50 +01:00
e31b95c16d
test: tweak pause test to try and prevent failures in Windows CI
...
This test keeps failing with a timeout in Windows. I don't actually
think it should take that long to bring up an nginx container, so
I'm guessing that there's something else going on that's causing
trouble.
Increase the verbosity when running Compose commands: I think this
will generally make E2E test failures easier to diagnose by always
logging the full command that's going to be run and also capturing
stdout.
Add a health check and use `--wait` when launching the fixture for
the pause test. Combined with the verbosity increase, this should
make it easier to understand what's going on here.
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
2023-02-27 14:20:20 -05:00
Jes Cok
Guillaume Lours
Milas Bowman
Nicolas De Loof
Jeremy Fleischman
Mateus Esdras
TP-O
Benjamín Guzmán
Tran Phong
Sebastiaan van Stijn
Luis Rascao
Laura Brehm