1berry/docker-compose
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,246 Commits 20 Branches 275 Tags
Commit Graph

140 Commits

Author SHA1 Message Date
Silvin Lubecki
0a9d1277c5 Display builder's name on the first build line. 
Code borrowed from buildx commands/build.go.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
 2023-08-04 17:11:44 +02:00
Silvin Lubecki
7c42776770
Improve buildkit node creation (#10843) 
Move builder and nodes initialization code up, avoiding to recreate/load them for every service build.

Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
 2023-08-03 15:11:16 -04:00
Milas Bowman
1ae191a936 trace: instrument compose up at a high-level 
* Image pull
* Image build
* Service apply
  * Scale down/up (event)
  * Recreate container (event)
  * Scale up (event)
  * Container start (event)

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-07-19 11:26:12 +02:00
Milas Bowman
636c13f818 build: do not attempt to push unnamed service images 
When building, if images are being pushed, ensure that only
named images (i.e. services with a populated `image` field)
are attempted to be pushed.

Services without `image` get an auto-generated name, which
will be a "Docker library" reference since they're in the
format `$project-$service`, which is implicitly the same as
`docker.io/library/$project-$service`. A push for that is
never desirable / will always fail.

The key here is that we cannot overwrite the `<svc>.image`
field when doing builds, as we need to be able to check for
its presence to determine whether a push makes sense.

Fixes #10813.

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-07-19 09:58:37 +02:00
Guillaume Lours
28301fb1a4 add support of --builder and BUILDX_BUILDER 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2023-07-03 10:11:18 +02:00
Milas Bowman
061b52da9a ci: build fix for new buildx 
Signed-off-by: Milas Bowman <milas.bowman@docker.com>
 2023-06-21 11:17:39 +02:00
Milas Bowman
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
Nicolas De Loof
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
Guillaume Lours
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
Nicolas De Loof
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
Nicolas De Loof
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
Guillaume Lours
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
Nicolas De loof
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
Nicolas De Loof
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
Nicolas De loof
67455e9f33
fix builkit progressui integration (#10535) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-05-08 09:21:41 -04:00
Nicolas De Loof
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
Guillaume Lours
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
Guillaume Lours
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
Nicolas De Loof
d01ef5887a restore support for --memory 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-25 15:41:08 +02:00
Nicolas De Loof
65fda18821 bump compose-go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-04-17 17:19:56 +02:00
Milas Bowman
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
Nicolas De Loof
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
Guillaume Lours
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
Nicolas De Loof
981cb2024e
prevent panic using classic builder 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-31 11:59:22 +02:00
Guillaume Lours
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
Nicolas De Loof
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
Nicolas De Loof
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
Laura Brehm
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
Nicolas De Loof
e0aaccf430 introduce dockerfile_inline 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-15 10:19:04 +01:00
Nicolas De Loof
e492330dd5 collect built image IDs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-03-15 09:47:32 +01:00
Nicolas De Loof
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
Nicolas De Loof
93bffd9a7f
prevent assignment to entry in nil map 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-02-07 20:50:15 +01:00
maxcleme
634a7d2a7b Support for docker compose build --push when using multiple platforms 
Signed-off-by: maxcleme <maxime.clement@docker.com>
 2023-01-26 16:54:41 +01:00
Nicolas De Loof
c15bf1955a debounce refresh requests with quietperiod 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-18 22:12:54 +01:00
Nicolas De Loof
3e12a7cb23 pass proxy config as build args - same as docker/buildx#959 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-10 12:15:13 +01:00
Edward Muller
73ebbffb08 Don't share the options map 
Without this I get an exception when building multiple images in a
compose run.

```
fatal error: concurrent map writes

goroutine 16 [running]:
github.com/docker/compose/v2/pkg/compose.(*composeService).build.func1({0x2cba4e0, 0xc00019b2c0}, {0xc000233150?, 0xd?})
        github.com/docker/compose/v2/pkg/compose/build.go:95 +0x652
github.com/docker/compose/v2/pkg/compose.(*graphTraversal).run.func1()
        github.com/docker/compose/v2/pkg/compose/dependencies.go:127 +0x63
golang.org/x/sync/errgroup.(*Group).Go.func1()
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:75 +0x64
created by golang.org/x/sync/errgroup.(*Group).Go
        golang.org/x/sync@v0.1.0/errgroup/errgroup.go:72 +0xa5
...
```

I'm not sure why the map is currently shared, but with this patch
applied my docker-compose build run works.

Signed-off-by: Edward Muller <emuller@fastly.com>
 2023-01-09 12:01:57 +01:00
Nicolas De Loof
b96e27e0e7 limit build concurrency according to --parallel 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2023-01-03 12:01:30 +01:00
Guillaume Lours
fd353ffa94 add support of privileged attribut in service.build section 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-12-23 09:32:48 +01:00
Sebastiaan van Stijn
87a0a57f70 Cleanup tips from output 
The scan tip has been shown for two years, and most users will know
about it by now. Presenting the message also involved checking if the
plugin was installed, and wether or not the message was shown before,
which also caused some overhead, so cleaning up the output a bit.

The corresponding DOCKER_SCAN_SUGGEST environment-variable is also
removed with this.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2022-12-06 23:29:03 +01:00
Guillaume Lours
10a5d998e6 useDockerDefaultOrServicePlatform fct should return service.platform if defined 
and present in the build.platforms list (or if the list is empty)

Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-11-25 09:03:03 +01:00
Guillaume Lours
18ce1f41b7
replace deprecated functions 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-10-18 16:57:53 +02:00
Guillaume Lours
3bf29d401c bump docker dependencies version 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-10-18 16:26:54 +02:00
Bartłomiej Klimczak
aa297a9969
remove unnecessary code 
Signed-off-by: Bartłomiej Klimczak <bartlomiej.klimczak88@gmail.com>
 2022-09-26 20:54:33 +02:00
Bartłomiej Klimczak
0d0a02cc6b
add more information when service.platform isn't part of service.build.platforms 
Signed-off-by: Bartłomiej Klimczak <bartlomiej.klimczak88@gmail.com>
 2022-09-26 20:44:59 +02:00
Guillaume Lours
ce3700d334 keep the platform defined, in priority, via DOCKER_DEFAULT_PLATFORM or the service.plaform one if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-22 13:46:24 +02:00
Guillaume Lours
71ab6c9eef
configure default builder export when no build.platforms defined 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-20 15:27:41 +02:00
Guillaume Lours
a1c50ef2c9
keep the platform defined via DOCKER_DEFAULT_PLATFORM during build if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-16 22:19:31 +02:00
Guillaume Lours
0e975262da
keep the platform defined at service level during build if no build platforms provided 
Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>
 2022-09-15 08:30:52 +02:00
Milas Bowman
b49b9ffe7e Merge remote-tracking branch 'upstream/v2' into down-image-rm 2022-09-13 18:00:41 +01:00
Guillaume Lours
0ac0e29294
Merge pull request #9729 from glours/add-platforms-build 
Add platforms build
 2022-09-08 11:42:16 +02:00