Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build: add platforms #267

Merged
merged 1 commit into from Aug 2, 2022
Merged

Conversation

AkihiroSuda
Copy link
Contributor

What this PR does / why we need it:
Add platforms ([]string) to build.md for supporting multi-platform builds

Which issue(s) this PR fixes:

Fixes #120

@AkihiroSuda
Copy link
Contributor Author

cc @chris-crone @tonistiigi

@thaJeztah
Copy link
Member

I don't think there was consensus yet on the proposal, because The service under which the build is defined also has a "platform" option https://github.com/compose-spec/compose-spec/blob/master/spec.md#platform

This would be confusing to have, and also means the service has itself can have a different platform than the build defines (?)

@thaJeztah
Copy link
Member

^^ which is why I wrote #120 (comment) "Proposal: make images (and "build") a first-class citizen in the compose spec" (#188)

@ndeloof
Copy link
Collaborator

ndeloof commented Jul 6, 2022

IMHO it makes perfect sense to distinguish platform selected to run a service, and platform(s) we want to support to build the service image, so there's no collision between the existing service.platform attribute and the proposed build.platforms one.

@AkihiroSuda
Copy link
Contributor Author

This would be confusing to have, and also means the service has itself can have a different platform than the build defines (?)

Yes, just like docker run --platform and docker build --platform, and I think that is fine.
An implementation may print a notice message in that case.

Copy link
Contributor

@glours glours left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@glours
Copy link
Contributor

glours commented Jul 6, 2022

PR Implementing the platform definition of #233 proposal

@thaJeztah
Copy link
Member

The build here is to a pre-condition for the specified service, not a "generic" build; so what's the expected result of;

services:
  foo:
    platform: "linux/amd64"
    build:
      context: .
      platforms: ["linux/amd64", "linux/arm64"]

On a daemon only supporting a single architecture in the image store, the above may build linux/arm64 as last image, overwriting the linux/amd64

Similar cases may exist if the build.platforms have no intersection with service.platform, e.g.;

services:
  foo:
    platform: "linux/amd64"
    build:
      context: .
      platforms: ["linux/arm64"]

@AkihiroSuda
Copy link
Contributor Author

On a daemon only supporting a single architecture in the image store, the above may build linux/arm64 as last image, overwriting the linux/amd64

Similar cases may exist if the build.platforms have no intersection with service.platform, e.g.;

The implementation should print an error or a warning. An error would be preferable.

@AkihiroSuda AkihiroSuda force-pushed the build-platforms branch 2 times, most recently from 124b38a to 195dfc7 Compare July 6, 2022 13:08
@AkihiroSuda
Copy link
Contributor Author

Updated the PR to cover the concerns above

@AkihiroSuda AkihiroSuda force-pushed the build-platforms branch 2 times, most recently from cd61f31 to 67f4b1a Compare July 6, 2022 15:06
@AkihiroSuda
Copy link
Contributor Author

@thaJeztah Could you take a look again? 🙏

@glours
Copy link
Contributor

glours commented Jul 22, 2022

@ndeloof @EricHripko @justincormack @ulyssessouza can you take a look please?

Copy link
Collaborator

@EricHripko EricHripko left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking the time to contribute to the spec! I've got a quick question inline 💬

build.md Outdated Show resolved Hide resolved
Closes issue 120

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
@glours glours merged commit e079968 into compose-spec:master Aug 2, 2022
@glours
Copy link
Contributor

glours commented Aug 2, 2022

@AkihiroSuda is your compose-go PR ready to review?

@AkihiroSuda
Copy link
Contributor Author

@AkihiroSuda is your compose-go PR ready to review?

Yes, please

milas added a commit to milas/docker.github.io that referenced this pull request Sep 1, 2022
* tmpfs.mode: compose-spec/compose-spec#252
* build.tags: compose-spec/compose-spec#255
* env var secrets: compose-spec/compose-spec#257
* build.platforms: compose-spec/compose-spec#267

Signed-off-by: Milas Bowman <milas.bowman@docker.com>
krutkurt added a commit to krutkurt/compose-spec that referenced this pull request Jan 10, 2023
commit 7d5c7c8
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Dec 6 12:48:36 2022 +0100

    extra_host can be declared as a list or mapping

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 66d837f
Author: Guillaume Lours <705411+glours@users.noreply.github.com>
Date:   Mon Oct 17 09:59:15 2022 +0200

    improve wording on `published` port binding attribute

    Co-authored-by: Eric Hripko <eric@hripko.com>
    Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

commit 03bf63c
Author: Guillaume Lours <705411+glours@users.noreply.github.com>
Date:   Sat Sep 3 16:53:37 2022 +0200

    mark explicitly published port as string to avoid user confusion
    align the specification between short and long port syntax

    Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

commit 302cbc2
Author: Laura Brehm <laurabrehm@hey.com>
Date:   Fri Dec 23 00:31:05 2022 +0000

    Add support of `uts` in service definition

    Signed-off-by: Laura Brehm <laurabrehm@hey.com>

commit c0a8366
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Dec 20 09:01:30 2022 +0100

    add missing build.platform in schema

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 81229b9
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Fri Dec 16 15:03:59 2022 +0100

    introduce `cgroup=host|private`

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit d93fd03
Author: Guillaume Lours <705411+glours@users.noreply.github.com>
Date:   Mon Dec 19 18:14:49 2022 +0100

    add privileged attribut to build section

    Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com>

commit 1eb16a2
Merge: df82d22 61c3e3b
Author: Guillaume Lours <705411+glours@users.noreply.github.com>
Date:   Wed Nov 16 14:42:10 2022 +0100

    Merge pull request compose-spec#281 from epuronta/secret-target-tweak

    Clarify secret.target absolute path syntax

commit 61c3e3b
Author: Eetu Purontaus <eetu.purontaus@gmail.com>
Date:   Tue Oct 25 11:40:43 2022 +0300

    Clarify secret.target absolute path syntax

    Signed-off-by: Eetu Purontaus <eetu.purontaus@gmail.com>

commit df82d22
Merge: bf599fe e2eabd9
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Sep 3 15:14:21 2022 +0100

    Merge pull request compose-spec#266 from AkihiroSuda/fix-darwin-platform

    platform: s/osx/darwin/

commit e2eabd9
Author: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date:   Wed Jul 6 13:32:49 2022 +0900

    platform: s/osx/darwin/

    The platform string conforms to the Go/OCI convention.
    https://github.com/opencontainers/image-spec/blob/v1.0.2/image-index.md

    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

commit bf599fe
Merge: e68e492 fbb656a
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Sep 3 14:49:27 2022 +0100

    Merge pull request compose-spec#271 from nopdotcom/typo-configs-short-syntax-example-rev2

    Typo: missing line in configs "short syntax” example

commit fbb656a
Merge: 7f4904e e68e492
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Sep 3 14:49:15 2022 +0100

    Merge branch 'master' into typo-configs-short-syntax-example-rev2

commit e68e492
Merge: 3ce7e88 0c9e74e
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Sep 3 14:44:53 2022 +0100

    Merge pull request compose-spec#258 from compose-spec/dependabot/bundler/nokogiri-1.13.6

    Bump nokogiri from 1.11.7 to 1.13.6

commit 0c9e74e
Merge: 3fdf561 3ce7e88
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Sep 3 14:43:32 2022 +0100

    Merge branch 'master' into dependabot/bundler/nokogiri-1.13.6

commit 3ce7e88
Merge: f8ddb4f 066ce4e
Author: Guillaume Lours <705411+glours@users.noreply.github.com>
Date:   Thu Sep 1 17:49:45 2022 +0200

    Merge pull request compose-spec#273 from milas/misc-typo-fixes

    chore: typo/link fixes backported from docker.github.io

commit 066ce4e
Author: Milas Bowman <milas.bowman@docker.com>
Date:   Thu Sep 1 10:21:03 2022 -0400

    chore: typo/link fixes backported from docker.github.io

    The version of the spec that's hosted on the public Docker docs
    site had some manual clean up done on it that wasn't made here.

    Merging the changes back here to get them back into alignment.

    See https://github.com/docker/docker.github.io/blob/master/compose/compose-file/index.md

    Signed-off-by: Milas Bowman <milas.bowman@docker.com>

commit 7f4904e
Author: Jay Carlson <nop@nop.com>
Date:   Mon Jul 25 13:31:06 2022 -0700

    Typo: missing line in configs "short syntax" example

    The paragraph above says "grant the `redis` service access to the
    `my_config` and `my_other_config` configs."  While `my_other_config`
    is defined, it is not added to the `redis` `configs` list.

    I suspect this was a merge error or something.

    To ensure I wasn't going crazy, I verified that at least Docker
    Compose v2 requires this line for the second config to be
    materialized inside the service.

    Signed-off-by: Jay Carlson <nop@nop.com>

commit f8ddb4f
Merge: e079968 f79776a
Author: Guillaume Lours <guillaume@lours.me>
Date:   Tue Aug 2 19:07:40 2022 +0200

    Merge pull request compose-spec#268 from compose-spec/dependabot/bundler/tzinfo-1.2.10

    Bump tzinfo from 1.2.9 to 1.2.10

commit f79776a
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jul 22 09:09:33 2022 +0000

    Bump tzinfo from 1.2.9 to 1.2.10

    Bumps [tzinfo](https://github.com/tzinfo/tzinfo) from 1.2.9 to 1.2.10.
    - [Release notes](https://github.com/tzinfo/tzinfo/releases)
    - [Changelog](https://github.com/tzinfo/tzinfo/blob/master/CHANGES.md)
    - [Commits](tzinfo/tzinfo@v1.2.9...v1.2.10)

    ---
    updated-dependencies:
    - dependency-name: tzinfo
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit e079968
Merge: a5cd401 59963d0
Author: Guillaume Lours <guillaume@lours.me>
Date:   Tue Aug 2 19:04:46 2022 +0200

    Merge pull request compose-spec#267 from AkihiroSuda/build-platforms

    build: add platforms

commit 59963d0
Author: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date:   Wed Jul 6 14:59:18 2022 +0900

    build: add platforms

    Closes issue 120

    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

commit 3fdf561
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Thu May 19 03:25:04 2022 +0000

    Bump nokogiri from 1.11.7 to 1.13.6

    Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.7 to 1.13.6.
    - [Release notes](https://github.com/sparklemotion/nokogiri/releases)
    - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
    - [Commits](sparklemotion/nokogiri@v1.11.7...v1.13.6)

    ---
    updated-dependencies:
    - dependency-name: nokogiri
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit a5cd401
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Thu Jun 2 08:18:22 2022 +0200

    Add Guillaume Lours as a maintainer

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 5260c1b
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Wed May 18 08:25:28 2022 +0200

    introduce ability to define secret by environment variable

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit b9b1222
Merge: 54bf07e 2cad342
Author: Guillaume Lours <guillaume@lours.me>
Date:   Fri May 13 19:37:44 2022 +0200

    Merge pull request compose-spec#255 from glours/add-tags-to-build-section

    Add support of tags in the build section

commit 2cad342
Author: Guillaume Lours <guillaume@lours.me>
Date:   Fri May 13 19:33:05 2022 +0200

    Fix typo in tag property description of build section

    Co-authored-by: Eric Hripko <eric@hripko.com>
    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 79ce644
Author: Guillaume Lours <guillaume@lours.me>
Date:   Mon May 9 15:16:16 2022 +0200

    use list notation for tags in build section

    Co-authored-by: Ulysses Souza <ulysses.souza@docker.com>
    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 77d99aa
Author: Guillaume Lours <guillaume@lours.me>
Date:   Wed May 4 12:12:14 2022 +0200

    update the tags example to match the list definition

    Co-authored-by: Ulysses Souza <ulysses.souza@docker.com>
    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 6b017e7
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Mon May 2 17:18:35 2022 +0200

    Add support of tags in the build section

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 54bf07e
Merge: 6c1f542 f7a1b92
Author: Ulysses Souza <ulyssessouza@gmail.com>
Date:   Wed May 4 11:01:50 2022 +0200

    Merge pull request compose-spec#252 from ndeloof/tmpfs_mode

    introduce `tmpfs.mode`

commit f7a1b92
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Thu Apr 28 21:43:51 2022 +0200

    introduce tmpfs.mode

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 6c1f542
Author: Guillaume Lours <guillaume@lours.me>
Date:   Mon May 2 10:19:02 2022 +0200

    update pull link in the no_cache section of build page

    Co-authored-by: Eric Hripko <eric@hripko.com>

commit e754ead
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Wed Mar 2 08:18:18 2022 +0100

    introduce `no_cache` and `pull` to force a full rebuild

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 846cabc
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Thu Mar 10 12:32:16 2022 +0100

    define a json ref for service secrets and confids properties

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit a797a7b
Author: Guillaume Lours <guillaume@lours.me>
Date:   Thu Mar 10 12:06:18 2022 +0100

    Update when compose implementations should report an error with secrets build property

    Co-authored-by: Nicolas De loof <nicolas.deloof@gmail.com>
    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit cb27949
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Thu Mar 10 09:44:00 2022 +0100

    add secrets property to build section

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 24e1994
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Fri Apr 8 15:09:14 2022 +0200

    External resources SHOULD not allow passing other attributes

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit b9bab6f
Author: Usha Mandya <usha.mandya@docker.com>
Date:   Thu Mar 24 17:34:51 2022 +0000

    Fix anchor references

    Signed-off-by: Usha Mandya <usha.mandya@docker.com>

commit 0c768be
Author: Nathan Weeks <1800812+nathanweeks@users.noreply.github.com>
Date:   Wed Mar 2 21:05:06 2022 -0500

    Fix copy/paste config name typo in Configs section

    Signed-off-by: Nathan Weeks <1800812+nathanweeks@users.noreply.github.com>

commit e13d6e4
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Tue Mar 8 21:21:59 2022 +0100

    fix typos and improvement of the ssh section readability

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 40f015a
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Tue Mar 8 14:17:04 2022 +0100

    change ssh property to a simple collection (list or dict)

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 4757209
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Fri Mar 4 23:54:20 2022 +0100

    change json spec of ssh type

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 91e55ad
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Fri Mar 4 16:55:39 2022 +0100

    remove the empty alias to the default ssh agent in the build section

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 239138c
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Thu Mar 3 15:50:57 2022 +0100

    be more specific on the ssh format

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 0850833
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Thu Mar 3 09:47:25 2022 +0100

    change ssh type to string and update ssh section with contributors feebacks

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 0de6875
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Wed Mar 2 15:44:58 2022 +0100

    simplify the syntaxt section of ssh property

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 757324d
Author: Guillaume Lours <guillaume.lours@docker.com>
Date:   Wed Mar 2 15:11:20 2022 +0100

    Add ssh definition to the service build section

    Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>

commit 4a91484
Author: Hang Yan <hang.yan@hotmail.com>
Date:   Fri Oct 8 10:04:45 2021 +0800

    Update field order in services

    Signed-off-by: Hang Yan <hang.yan@hotmail.com>

commit ffd2294
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Sun Nov 28 10:03:57 2021 +0100

    unsupported cache-to must not fail compose build

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit f879139
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Mon Nov 8 13:59:54 2021 +0100

    introduce cache-to

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit f3bc7a4
Author: Matt Bussing <31907187+MattBussing@users.noreply.github.com>
Date:   Thu Dec 30 09:37:06 2021 -0600

    fixing grammar mistake

    Signed-off-by: Matt Bussing <mbussing44@gmail.com>

commit 3a2731e
Merge: 1249d9e c10efda
Author: Guillaume Lours <guillaume@lours.me>
Date:   Tue Feb 15 14:11:44 2022 +0100

    Merge pull request compose-spec#228 from tvsaru/patch-1

    Typo in deploy.md

commit c10efda
Author: Saru Thuraiman <tvsaru@gmail.com>
Date:   Mon Jan 31 21:40:33 2022 -0500

    Typo in deploy.md

    Signed-off-by: Saru Thuraiman <tvsaru@gmail.com>

commit 1249d9e
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Sun Nov 28 12:53:02 2021 +0100

    typo

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit deaf2de
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Nov 16 08:49:16 2021 +0100

    document use of COMPOSE_PROJECT_NAME as env variable

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 1f3ec13
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Sat Oct 2 17:52:11 2021 +0200

    introduce top-level `name`

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit c4bab26
Author: Bojan Bogojevic <20166636+Bojan023@users.noreply.github.com>
Date:   Wed Jan 5 17:59:25 2022 +0100

    Fix pids limit key

    Pasting previous description compose-spec@e8db802 caused the description to mention the previous (and now wrong) key

    Signed-off-by: Bojan Bogojević <20166636+Bojan023@users.noreply.github.com>

commit 1ca7dd2
Author: Or Bin <orbin50@gmail.com>
Date:   Wed Jan 19 12:07:23 2022 +0200

    Fixed a tiny typo: Rerefence -> Reference

    Signed-off-by: Or Bin <or@raftt.io>

commit 0fb8d23
Author: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
Date:   Fri Jan 7 18:57:45 2022 +0100

    Changed from long description to list.

    Changed information about volume options from multi sentences
    long description to bullet list of options for better readability.

    Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>

commit d020ad9
Author: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
Date:   Sun Jan 2 16:12:45 2022 +0100

    Added SELinux description for volume short syntax

    Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>

commit ab58eae
Author: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>
Date:   Sat Jan 1 14:04:47 2022 +0100

    Added volume bind option SELinux :z :Z

    Related with compose-spec/compose-go#213

    This feature describe the SELinux field for setting the :z or :Z
    bind option for relabeling SELinux label.

    It fixes compose-spec#191

    References:
    - https://docs.docker.com/storage/bind-mounts/#configure-the-selinux-label

    Signed-off-by: Tymoteusz Blazejczyk <tymoteusz.blazejczyk@tymonx.com>

commit 95f8b4f
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Mon Jan 3 08:10:58 2022 +0100

    published port can be a range

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit e8db802
Author: Sebastiaan van Stijn <github@gone.nl>
Date:   Thu Dec 2 13:18:07 2021 +0100

    Add missing deploy.limits.pids (from schema 3.9), deprecate pids_limit

    compose schema v3.9 added support for `deploy.limits.pids` (through docker/cli@851eeb9),
    however, work on compose-spec was already in progress, which lead to changes from
    the 3.9 schema to not be included.

    This patch adds the missing option and mars the `services.{name}.pids_limit` as
    deprecated, similar to comparable limit- and reservation options (`services.{name}.cpus`,
    `services.{name}.mem_limit`, `services.{name}.mem_reservation`.

    Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

commit a5a952e
Author: Tim Way <1091435+timway@users.noreply.github.com>
Date:   Tue Oct 12 17:17:53 2021 -0500

    Minor Spacing Adjustment

    While not required by the spec the rest of the documents use 2 spaces for nesting in YAML code blocks. This snuck through at 4.

    Signed-off-by: Tim Way <1091435+timway@users.noreply.github.com>

commit 61e518d
Author: Hang Yan <hang.yan@hotmail.com>
Date:   Fri Oct 8 10:01:29 2021 +0800

    Update english sentence

    Signed-off-by: Hang Yan <hang.yan@hotmail.com>

commit b41c6b3
Author: Hang Yan <hang.yan@hotmail.com>
Date:   Mon Oct 4 16:22:30 2021 +0800

    Small typo fix

    Signed-off-by: Hang Yan <hang.yan@hotmail.com>

commit 5a37b4d
Merge: cf9408e 1a9d876
Author: Ulysses Souza <ulyssessouza@gmail.com>
Date:   Mon Nov 15 12:11:49 2021 +0100

    Merge pull request compose-spec#213 from ndeloof/deprecate_compose_ref

    Make docker compose v2 the reference implementation

commit 1a9d876
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Sat Nov 13 17:02:16 2021 +0100

    Make docker compose v2 the reference implementation

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit cf9408e
Author: Mathias Brodala <mbrodala@pagemachine.de>
Date:   Thu Sep 9 16:36:15 2021 +0200

    Use volume names from examples in explanation

    Signed-off-by: Mathias Brodala <mbrodala@pagemachine.de>

commit 5a48509
Author: MarilynFranklin <marilyn.j.franklin@gmail.com>
Date:   Sun Sep 27 21:34:23 2020 -0500

    Support nested variable expansion

    Signed-off-by: MarilynFranklin <marilyn.j.franklin@gmail.com>

commit 43f6537
Merge: f0857c3 14d7dbb
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Wed Sep 29 15:22:23 2021 +0200

    Merge pull request compose-spec#194 from kendru/clarify-devices-format

commit f0857c3
Merge: aaeefc4 a541451
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Wed Sep 29 13:14:01 2021 +0200

    Merge pull request compose-spec#205 from ndeloof/tmpfs_size

commit a541451
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Wed Sep 29 09:22:20 2021 +0200

    define tmpfs.size as string or integer

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit aaeefc4
Merge: 1f11b9c e64bba8
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Thu Sep 23 19:05:32 2021 +0200

    Merge pull request compose-spec#200 from ndeloof/owners

commit e64bba8
Merge: 994ccb2 1f11b9c
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Thu Sep 23 19:05:25 2021 +0200

    Merge branch 'master' into owners

commit 1f11b9c
Merge: 7c03c3c 080b12d
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Sep 17 15:52:47 2021 +0200

    Merge pull request compose-spec#181 from compose-spec/dependabot/bundler/addressable-2.8.0

commit 080b12d
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Sep 17 13:16:07 2021 +0000

    Bump addressable from 2.7.0 to 2.8.0

    Bumps [addressable](https://github.com/sporkmonger/addressable) from 2.7.0 to 2.8.0.
    - [Release notes](https://github.com/sporkmonger/addressable/releases)
    - [Changelog](https://github.com/sporkmonger/addressable/blob/main/CHANGELOG.md)
    - [Commits](sporkmonger/addressable@addressable-2.7.0...addressable-2.8.0)

    ---
    updated-dependencies:
    - dependency-name: addressable
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 7c03c3c
Merge: eb37e8b 071b9e7
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Sep 17 15:13:37 2021 +0200

    Merge pull request compose-spec#167 from compose-spec/dependabot/bundler/rexml-3.2.5

commit 071b9e7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Sep 17 13:13:28 2021 +0000

    Bump rexml from 3.2.4 to 3.2.5

    Bumps [rexml](https://github.com/ruby/rexml) from 3.2.4 to 3.2.5.
    - [Release notes](https://github.com/ruby/rexml/releases)
    - [Changelog](https://github.com/ruby/rexml/blob/master/NEWS.md)
    - [Commits](ruby/rexml@v3.2.4...v3.2.5)

    Signed-off-by: dependabot[bot] <support@github.com>

commit 994ccb2
Merge: 6c1a070 eb37e8b
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Sep 14 21:01:03 2021 +0200

    Merge branch 'master' into owners

commit 6c1a070
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Mon Sep 13 08:56:00 2021 +0200

    update maintainers

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit eb37e8b
Merge: c1dbc42 61ee847
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Sep 10 14:25:12 2021 +0200

    Merge pull request compose-spec#183 from bjmmedeiros/patch-1

commit c1dbc42
Merge: b33e716 4f68f6d
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Sep 10 14:24:37 2021 +0200

    Merge pull request compose-spec#193 from kendru/fix-delimiter-docs

    Update spec to use colon-separated

commit b33e716
Merge: b369fe5 e418731
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Sep 10 14:23:21 2021 +0200

    Merge pull request compose-spec#185 from MichaelLutaaya/patch-1

commit e418731
Author: Michael Lutaaya <michael@lutaaya.com>
Date:   Wed Jul 21 20:35:43 2021 -0400

    Fix typo in image section of Compose spec

    `sha356` → `sha256`

    Signed-off-by: Michael Lutaaya <michael@lutaaya.com>

commit 14d7dbb
Author: Andrew Meredith <andymeredith@gmail.com>
Date:   Thu Sep 2 15:57:31 2021 -0600

    Clarify devices format

    Updates the description of `services.devices` to clarify which segment
    is the host path and which is the container path. It also indicates the
    optional third element, which is used to supply cgroup permissions and
    is supported by Docker Compose.

    Signed-off-by: Andrew Meredith <andymeredith@gmail.com>

commit 4f68f6d
Author: Andrew Meredith <andymeredith@gmail.com>
Date:   Thu Sep 2 15:43:17 2021 -0600

    Update spec to use colon-separated

    There were two references to strings that are "comma-separated", but the
    docs continue to describe the delimiter as actually being a colon. This
    updates the prose to reference the correct punctuation mark.

    Signed-off-by: Andrew Meredith <andymeredith@gmail.com>

commit b369fe5
Merge: 5141aaf 1491eaf
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Wed Aug 4 20:59:29 2021 +0200

    Merge pull request compose-spec#187 from ndeloof/env_bool

    Allow use of plain boolean as environment values

commit 1491eaf
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Wed Aug 4 15:59:02 2021 +0200

    Allow use of plain boolean as environment values

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 61ee847
Author: bjmmedeiros <1548442+bjmmedeiros@users.noreply.github.com>
Date:   Mon Jul 19 00:24:53 2021 -0300

    Update spec.md

    Trivial typo fix: MUTS -> MUST

    Signed-off-by: bjmmedeiros <1548442+bjmmedeiros@users.noreply.github.com>

commit 5141aaf
Merge: 3941992 7a8f9ea
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Sat Jun 19 12:32:09 2021 +0200

    Merge pull request compose-spec#179 from compose-spec/pull-policy-missing

commit 3941992
Merge: 896f84b d6b67d3
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Sat Jun 19 12:31:32 2021 +0200

    Merge pull request compose-spec#174 from decentral1se/patch-1

commit 7a8f9ea
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Sat Jun 19 09:35:45 2021 +0100

    missing is a valid pull_policy

    Signed-off-by: Eric Hripko <ehripko@bloomberg.net>

commit d6b67d3
Author: decentral1se <lukewm@riseup.net>
Date:   Fri Jun 18 22:25:10 2021 +0200

    Refer to docker/compose-cli

    Signed-off-by: decentral1se <lukewm@riseup.net>

commit 896f84b
Merge: 7edce04 5913fe9
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Jun 18 19:10:28 2021 +0200

    Merge pull request compose-spec#178 from compose-spec/dependabot/bundler/nokogiri-1.11.7

    Bump nokogiri from 1.11.1 to 1.11.7

commit 7edce04
Merge: 74b933d f70b37a
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Fri Jun 18 19:10:18 2021 +0200

    Merge pull request compose-spec#169 from pchico83/okteto

commit 5913fe9
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Date:   Fri Jun 18 17:07:56 2021 +0000

    Bump nokogiri from 1.11.1 to 1.11.7

    Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.1 to 1.11.7.
    - [Release notes](https://github.com/sparklemotion/nokogiri/releases)
    - [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
    - [Commits](sparklemotion/nokogiri@v1.11.1...v1.11.7)

    ---
    updated-dependencies:
    - dependency-name: nokogiri
      dependency-type: indirect
    ...

    Signed-off-by: dependabot[bot] <support@github.com>

commit 74b933d
Merge: 002f33d 151c35e
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue May 25 13:10:26 2021 +0200

    Merge pull request compose-spec#173 from ndeloof/host_ip

    document support for port's host_ip in "long syntax"

commit 151c35e
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue May 25 10:45:08 2021 +0200

    document support for port's host_ip in "long syntax"

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit f70b37a
Author: Pablo Chico de Guzman <pchico83@gmail.com>
Date:   Tue May 4 23:48:42 2021 +0200

    Add Okteto Stacks to the list of implementations

    Signed-off-by: Pablo Chico de Guzman <pchico83@gmail.com>

commit 002f33d
Merge: 3978a02 48a79c5
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 20:35:27 2021 +0200

    Merge branch 'AkihiroSuda-readme'

commit 48a79c5
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 10:19:21 2021 +0200

    introduce create_host_path

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit 19f7ae8
Author: Chris Crone <christopher.crone@docker.com>
Date:   Tue Apr 27 14:13:05 2021 +0200

    Remove Compose on Kubernetes from implementations

    Compose on Kubernetes has been deprecated.

    Signed-off-by: Chris Crone <christopher.crone@docker.com>

commit 3978a02
Merge: 329ffc1 550eafa
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 19:40:06 2021 +0200

    Merge pull request compose-spec#165 from chris-crone/remove-compose-on-k8s

    Remove Compose on Kubernetes from implementations

commit 550eafa
Merge: 599e649 329ffc1
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 19:39:58 2021 +0200

    Merge branch 'master' into remove-compose-on-k8s

commit 599e649
Author: Chris Crone <christopher.crone@docker.com>
Date:   Tue Apr 27 14:13:05 2021 +0200

    Remove Compose on Kubernetes from implementations

    Compose on Kubernetes has been deprecated.

    Signed-off-by: Chris Crone <christopher.crone@docker.com>

commit 329ffc1
Merge: b7fb5b6 3234a03
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 15:00:00 2021 +0200

    Merge pull request compose-spec#163 from ndeloof/create_host_path

    introduce create_host_path

commit 3234a03
Author: Nicolas De Loof <nicolas.deloof@gmail.com>
Date:   Tue Apr 27 10:19:21 2021 +0200

    introduce create_host_path

    Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>

commit a672933
Author: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date:   Fri Apr 23 17:07:55 2021 +0900

    Add nerdctl to the implementation list

    Implementation status is explained in https://github.com/containerd/nerdctl/blob/master/docs/compose.md

    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

commit b7fb5b6
Merge: 4423eba 406feef
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Thu Apr 22 18:37:02 2021 +0100

    Merge pull request compose-spec#147 from EricHripko/master

    Start generating GitHub Pages from the spec

commit 406feef
Merge: 4259b1a 4423eba
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Thu Apr 22 18:35:18 2021 +0100

    Merge branch 'master' into master

commit 4423eba
Merge: 167f207 90c38b8
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Thu Apr 8 12:20:33 2021 +0200

    Merge pull request compose-spec#160 from AkihiroSuda/pids-limit

    pid_limit -> pids_limit

commit 90c38b8
Author: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
Date:   Thu Apr 8 18:28:31 2021 +0900

    pid_limit -> pids_limit

    "pids_limit" is the correct form, added in Docker Compose spec 2.1:
    docker/compose@6a151aa

    Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>

commit 167f207
Merge: db041f7 73e46c4
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Mar 30 11:51:07 2021 +0200

    Merge pull request compose-spec#150 from mikesir87/fix-indentation-deploy

    Fix indentation on examples in the Deployment spec

commit 73e46c4
Merge: 45b4bd9 db041f7
Author: Nicolas De loof <nicolas.deloof@gmail.com>
Date:   Tue Mar 30 11:51:01 2021 +0200

    Merge branch 'master' into fix-indentation-deploy

commit db041f7
Merge: 7f63ac2 e475ef8
Author: Guillaume Tardif <guillaume.tardif@gmail.com>
Date:   Wed Mar 24 14:26:59 2021 +0100

    Merge pull request compose-spec#154 from compose-spec/fix-storage-opt

    Fix description of `storage_opt`

commit e475ef8
Author: Ulysses Souza <ulyssessouza@gmail.com>
Date:   Mon Mar 22 15:29:11 2021 -0300

    Fix description of `storage_opt`

    Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>

commit 7f63ac2
Merge: f9a5c72 0444176
Author: Chris Crone <christopher.crone@docker.com>
Date:   Mon Mar 22 15:39:52 2021 +0100

    Merge pull request compose-spec#153 from aiordache/missing_service_storage_opts

    Add missing `service.storage_opts`

commit 0444176
Author: Anca Iordache <anca.iordache@docker.com>
Date:   Mon Mar 22 11:44:33 2021 +0100

    Add missing service.storage_opts introduced in 2.1

    Signed-off-by: Anca Iordache <anca.iordache@docker.com>

commit 45b4bd9
Author: Michael Irwin <mikesir87@gmail.com>
Date:   Mon Mar 15 16:20:16 2021 -0400

    Fix indentation on examples in the Deployment spec

    Signed-off-by: Michael Irwin <mikesir87@gmail.com>

commit 4259b1a
Author: Eric Hripko <ehripko@bloomberg.net>
Date:   Fri Feb 26 14:05:17 2021 +0000

    Generate Github Pages from the spec

    Signed-off-by: Eric Hripko <ehripko@bloomberg.net>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add platform and other properties to service.build
6 participants