Skip to content

Commit

Permalink
docker-compse: WIP upgrade, needs go 1.21
Browse files Browse the repository at this point in the history 
Bumping compose to version v2.21.0-154-gce1ddb6c, which comprises the following commits:

    c665c53c bump buildx to v0.12.0 and adapt code to changes
    a39cf75e build(deps): bump github.com/compose-spec/compose-go
    46ba9c99 build(deps): bump github.com/spf13/cobra from 1.7.0 to 1.8.0
    5c5d30c6 build(deps): bump github.com/docker/cli
    36fa8d4e build(deps): bump github.com/docker/docker
    2384635e build(deps): bump github.com/moby/buildkit from 0.12.2 to 0.12.3
    2ba5e4c1 in watch mode force pull policy to build for services with both build and develop attributes This default behaviour will force a rebuild of the service images at watch process startup and be sure containers will be in sync with the local source code
    b1a26dac Assume /src/pkg/compose/testdata absolute workingdir to make tests reproducible
    5e77ae92 avoir use of []types.ServiceConfig
    f5572201 identify services to build and don't display 'building' if none
    8e1b3236 fix --remove-orphans not to consider disabled services as orphaned
    7cb1f8ba introduce RuntimeVersion for code to check container runtime supports required features
    cb01186c push also consider build.tags
    9c4efbdd Strip project prefix from docker-compose up output
    8ea7c9e0 Make it context aware and add test skipping options
    c1694360 render quiet after filtering applied
    254a94b0 bump golang to version 1.21.4
    cf608fa9 bump compose-go to v1.20.1
    426377a4 reject compose file using `secrets|configs.driver or template_driver`
    493f6c80 skips flaky e2e tests on watch and attach
    646a8fc0 fix docker/compose#11170 add newline in cmd/compose/build.go fmt.Fprint
    2945532f fix --pull documentation
    e5cd265a improve watch configuration logging Add action associated to each managed path
    d646d757 lint
    71237ef6 do not resolve cache dir until remote resource is in use
    0d905a89 add a copyright notice with original author
    b847c7f5 implement runtime file selection
    5e3d8f67 re-implement cache folder detection
    67279088 introduce --resolve-image-digests for publish to seal service images by digest
    4cd61957 fix build
    0d4cbbdb fix
    9631a49d ENGDOCS-1764
    328ca3f2 add docs upstream validation workflow
    e1bbfc63 build(deps): bump go.uber.org/goleak from 1.2.1 to 1.3.0
    616bba0a linter errors fixed
    ee6e3c2a NetworkList to NetworkInspect for ID search
    c7e31a3c Squashing feature branch commits in order to add signoff message.
    704a9fd3 Use project.ServiceNames() if no service specified in hash
    d9e0e42d Add branch configuration for pull_request trigger
    c48e3c4a Initial codeql.yml commit
    dd0803db fix SIGTERM support to stop/kill stack
    39008c53 align with OCI artifact best practices
    6c345b37 refactor(cmd/compose/run): remove redundant `len` check
    1ffa194e fail start if depependency is missing
    b9298101 check that the pull policy provided is a valid one or is not missing when --pull is used
    3d0207eb remove uncessary return value of pullComposeFiles function
    16a7c209 enable profile when down is ran with explicit service names
    818bc3c3 add sync+restart action to watch attribute
    38bc6d5d build(deps): bump github.com/containerd/containerd from 1.7.6 to 1.7.7
    0b6ce6ee build(deps): bump github.com/google/go-cmp from 0.5.9 to 0.6.0
    ae16bbbf build(deps): bump google.golang.org/grpc from 1.58.2 to 1.59.0
    d13ad1f9 build(deps): bump golang.org/x/sync from 0.3.0 to 0.4.0
    9b4d577c remove refrecence docs generation
    14b43c1a remove cucumber tests as we haven't added new ones for a while
    9dd081b9 add support of COMPOSE_ENV_FILES env variable to pass a list of env files
    2c0b0232 add dry-run support for publish command
    599e4b24 extract method to reduce cyclomatic complexity
    fe8c2780 warn user remote resource is disabled
    a345515f Don't delete dependent services
    8967df7a Apply platform before hashing
    4f694919 deps: remove deprecated github.com/pkg/errors
    6ecab957 Include image name in error message
    12e0ac89 pkg/compose/publish: use empty config descriptor mediaType
    a6b7d785 pkg/remote/oci: check artifactType instead of config.mediaType
    991901f2 pkg/remote/oci: refer to the manifest as manifest
    2d971fc9 update the watch warning message when no services with a develop section
    78f33619 ci: enable verbose output for e2e tests (#11045)
    44d21280 truncate command by default, introduce --no-trunc flag to get the full command
    ff2ff18c build(deps): bump google.golang.org/grpc from 1.58.1 to 1.58.2
    ab81db5b config --xx don't need `env_file` being parsed
    61c8be11 remove --timeout=0 flag to cleanup function of watch e2e test compose down command need the watch process to be killed to succeed
    6be5f300 move watch from alpha to main command
    c34c306c TestWatch to use new  `develop` section
    5ca35c88 implement publish
    805541be watch: use official `develop` section (#11026)
    8f489d6d build(deps): bump github.com/opencontainers/image-spec
    9ea8fbc6 build(deps): bump github.com/moby/buildkit from 0.12.1 to 0.12.2
    76f150e4 build(deps): bump gotest.tools/v3 from 3.5.0 to 3.5.1
    f447c809 build(deps): bump google.golang.org/grpc from 1.58.0 to 1.58.1
    4587d4ba build(deps): bump github.com/containerd/containerd from 1.7.3 to 1.7.6
    a697a069 introduce pull --missing flag to only pull images not present in cache
    8af49ff3 resolve service reference into container based on observed state
    f6e31dbc don't rely on depends_on to resolve volume_from, better use observed state
    6d5eb6fd update to go1.21.1
    9d7e0ad6 correct scale error messages formatting
    1a98a70b add scale command
    19bbb12f ci: tweak restricted imports in linter (#10992)
    7a134578 deps: upgrade Moby to v24.0.6 and gRPC to v1.58.0 (#10991)
    13115468 cli: fix `--build` flag for `create` (#10982)
    e1aa4f77 otel: add args & flags to cli traces (#10974)
    d7b0b2bd watch: build & launch the project at start (#10957)
    e0f39ebb pull OCI remote resource
    c9d54f09 introduce publish (alpha) command
    52e54ef9 doc: updated README.md to remove broken link
    f4f2e934 migrate to github.com/distribution/reference
    32c3d0a3 Enable service explicitly requested to be restarted
    1fdbcb62 build: pass BuildOptions around explicitly & fix multi-platform issues
    407a0d5b up: fix various race/deadlock conditions on exit (#10934)
    8caa6f1f pkg/api: replace uuid for basic random id

Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
  • Loading branch information
@zeddii
zeddii committed Jan 25, 2024
1 parent 525a5e9 commit 7dade50
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 324 deletions.
4 changes: 2 additions & 2 deletions recipes-containers/docker-compose/docker-compose_git.bb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DEPENDS = " \

# Specify the first two important SRCREVs as the format
SRCREV_FORMAT="compose_survey"
SRCREV_compose = "d6f842b042d2f2926901305336527b3eaadf067a"
SRCREV_compose = "c665c53cc1eb633a819fcaa9b47d77597b55d0eb"

SRC_URI = "git://github.com/docker/compose;name=compose;branch=main;protocol=https"

Expand All @@ -23,7 +23,7 @@ LIC_FILES_CHKSUM = "file://src/import/LICENSE;md5=175792518e4ac015ab6696d16c4f60

GO_IMPORT = "import"

PV = "v2.21.0"
PV = "v2.23.3"

COMPOSE_PKG = "github.com/docker/compose/v2"

Expand Down
117 changes: 41 additions & 76 deletions recipes-containers/docker-compose/files/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
## explicit
# github.com/buger/goterm v1.0.4
## explicit
# github.com/compose-spec/compose-go v1.18.3
# github.com/compose-spec/compose-go v1.20.2
## explicit
# github.com/containerd/console v1.0.3
## explicit
# github.com/containerd/containerd v1.7.3
# github.com/containerd/containerd v1.7.7
## explicit
# github.com/cucumber/godog v0.0.0-00010101000000-000000000000
# github.com/davecgh/go-spew v1.1.1
## explicit
# github.com/distribution/distribution/v3 v3.0.0-20230601133803-97b1d649c493
# github.com/distribution/reference v0.5.0
## explicit
# github.com/docker/buildx v0.11.2
# github.com/docker/buildx v0.12.0
## explicit
# github.com/docker/cli v24.0.5+incompatible
# github.com/docker/cli v24.0.7+incompatible
## explicit
# github.com/docker/cli-docs-tool v0.6.0
## explicit
# github.com/docker/docker v24.0.5+incompatible
# github.com/docker/docker v24.0.7+incompatible
## explicit
# github.com/docker/go-connections v0.4.0
## explicit
Expand All @@ -32,6 +32,8 @@
## explicit
# github.com/golang/mock v1.6.0
## explicit
# github.com/google/go-cmp v0.6.0
## explicit
# github.com/hashicorp/go-multierror v1.1.1
## explicit
# github.com/hashicorp/go-version v1.6.0
Expand All @@ -42,7 +44,7 @@
## explicit
# github.com/mitchellh/mapstructure v1.5.0
## explicit
# github.com/moby/buildkit v0.12.1
# github.com/moby/buildkit v0.13.0-beta1.0.20231023114302-d5c1d785b042
## explicit
# github.com/moby/patternmatcher v0.6.0
## explicit
Expand All @@ -52,13 +54,13 @@
## explicit
# github.com/opencontainers/go-digest v1.0.0
## explicit
# github.com/opencontainers/image-spec v1.1.0-rc4
# github.com/opencontainers/image-spec v1.1.0-rc5
## explicit
# github.com/pkg/errors v0.9.1
# github.com/otiai10/copy v1.14.0
## explicit
# github.com/sirupsen/logrus v1.9.3
## explicit
# github.com/spf13/cobra v1.7.0
# github.com/spf13/cobra v1.8.0
## explicit
# github.com/spf13/pflag v1.0.5
## explicit
Expand All @@ -78,22 +80,26 @@
## explicit
# go.opentelemetry.io/otel/trace v1.14.0
## explicit
# go.uber.org/goleak v1.2.1
# go.uber.org/goleak v1.3.0
## explicit
# golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
## explicit
# golang.org/x/sync v0.3.0
# golang.org/x/sync v0.5.0
## explicit
# google.golang.org/grpc v1.57.0
# golang.org/x/sys v0.14.0
## explicit
# gopkg.in/yaml.v2 v2.4.0
# google.golang.org/grpc v1.59.0
## explicit
# gotest.tools/v3 v3.5.0
# gotest.tools/v3 v3.5.1
## explicit
# github.com/AdaLogics/go-fuzz-headers v0.0.0-20230106234847-43070de90fa1
# github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24
## explicit
# github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1
## explicit
# github.com/Masterminds/semver/v3 v3.2.1
## explicit
# github.com/Microsoft/hcsshim v0.11.1
## explicit
# github.com/aws/aws-sdk-go-v2 v1.17.6
## explicit
# github.com/aws/aws-sdk-go-v2/config v1.18.16
Expand All @@ -120,26 +126,16 @@
## explicit
# github.com/beorn7/perks v1.0.1
## explicit
# github.com/bugsnag/bugsnag-go v1.5.0
## explicit
# github.com/cenkalti/backoff/v4 v4.2.0
## explicit
# github.com/cespare/xxhash/v2 v2.2.0
## explicit
# github.com/cloudflare/cfssl v1.6.4
# github.com/containerd/continuity v0.4.2
## explicit
# github.com/containerd/continuity v0.4.1
# github.com/containerd/log v0.1.0
## explicit
# github.com/containerd/typeurl/v2 v2.1.1
## explicit
# github.com/cucumber/gherkin-go/v19 v19.0.3
## explicit
# github.com/cucumber/messages-go/v16 v16.0.1
## explicit
# github.com/cyphar/filepath-securejoin v0.2.3
## explicit
# github.com/davecgh/go-spew v1.1.1
## explicit
# github.com/docker/distribution v2.8.2+incompatible
## explicit
# github.com/docker/docker-credential-helpers v0.7.0
Expand All @@ -166,8 +162,6 @@
## explicit
# github.com/gofrs/flock v0.8.1
## explicit
# github.com/gofrs/uuid v4.2.0+incompatible
## explicit
# github.com/gogo/googleapis v1.4.1
## explicit
# github.com/gogo/protobuf v1.3.2
Expand All @@ -176,8 +170,6 @@
## explicit
# github.com/google/gnostic v0.5.7-v3refs
## explicit
# github.com/google/go-cmp v0.5.9
## explicit
# github.com/google/gofuzz v1.2.0
## explicit
# github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510
Expand All @@ -190,22 +182,14 @@
## explicit
# github.com/hashicorp/errwrap v1.1.0
## explicit
# github.com/hashicorp/go-immutable-radix v1.3.1
## explicit
# github.com/hashicorp/go-memdb v1.3.2
## explicit
# github.com/hashicorp/golang-lru v0.5.4
## explicit
# github.com/hashicorp/hcl v1.0.0
# github.com/hashicorp/go-cleanhttp v0.5.2
## explicit
# github.com/imdario/mergo v0.3.16
## explicit
# github.com/in-toto/in-toto-golang v0.5.0
## explicit
# github.com/inconshreveable/mousetrap v1.1.0
## explicit
# github.com/jinzhu/gorm v1.9.11
## explicit
# github.com/josharian/intern v1.0.0
## explicit
# github.com/json-iterator/go v1.1.12
Expand All @@ -214,10 +198,6 @@
## explicit
# github.com/klauspost/compress v1.16.5
## explicit
# github.com/kr/pretty v0.3.0
## explicit
# github.com/magiconair/properties v1.8.6
## explicit
# github.com/mailru/easyjson v0.7.6
## explicit
# github.com/mattn/go-colorable v0.1.13
Expand Down Expand Up @@ -250,11 +230,11 @@
## explicit
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
# github.com/opencontainers/runc v1.1.7
# github.com/opencontainers/runc v1.1.9
## explicit
# github.com/pelletier/go-toml v1.9.5
## explicit
# github.com/pelletier/go-toml/v2 v2.0.5
# github.com/pkg/errors v0.9.1
## explicit
# github.com/pmezard/go-difflib v1.0.0
## explicit
Expand All @@ -274,14 +254,6 @@
## explicit
# github.com/shibumi/go-pathspec v1.3.0
## explicit
# github.com/spf13/afero v1.9.2
## explicit
# github.com/spf13/cast v1.5.0
## explicit
# github.com/spf13/jwalterweatherman v1.1.0
## explicit
# github.com/subosito/gotenv v1.4.1
## explicit
# github.com/tonistiigi/fsutil v0.0.0-20230629203738-36ef4d8c0dbb
## explicit
# github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea
Expand All @@ -294,8 +266,6 @@
## explicit
# github.com/xeipuuv/gojsonschema v1.2.0
## explicit
# github.com/zmap/zcrypto v0.0.0-20220605182715-4dfcec6e9a8c
## explicit
# go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.40.0
## explicit
# go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.40.0
Expand All @@ -310,47 +280,43 @@
## explicit
# go.opentelemetry.io/proto/otlp v0.19.0
## explicit
# golang.org/x/crypto v0.7.0
## explicit
# golang.org/x/exp v0.0.0-20230713183714-613f0c0eb8a1
# golang.org/x/crypto v0.14.0
## explicit
# golang.org/x/mod v0.11.0
## explicit
# golang.org/x/net v0.9.0
## explicit
# golang.org/x/oauth2 v0.7.0
# golang.org/x/net v0.17.0
## explicit
# golang.org/x/sys v0.7.0
# golang.org/x/oauth2 v0.11.0
## explicit
# golang.org/x/term v0.7.0
# golang.org/x/term v0.13.0
## explicit
# golang.org/x/text v0.9.0
# golang.org/x/text v0.13.0
## explicit
# golang.org/x/time v0.3.0
## explicit
# golang.org/x/tools v0.7.0
## explicit
# google.golang.org/appengine v1.6.7
## explicit
# google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54
# google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d
## explicit
# google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9
# google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d
## explicit
# google.golang.org/genproto/googleapis/rpc v0.0.0-20230525234030-28d5490b6b19
# google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d
## explicit
# google.golang.org/protobuf v1.30.0
# google.golang.org/protobuf v1.31.0
## explicit
# gopkg.in/inf.v0 v0.9.1
## explicit
# gopkg.in/ini.v1 v1.67.0
# gopkg.in/yaml.v2 v2.4.0
## explicit
# gopkg.in/yaml.v3 v3.0.1
## explicit
# k8s.io/api v0.26.2
# k8s.io/api v0.26.7
## explicit
# k8s.io/apimachinery v0.26.2
# k8s.io/apimachinery v0.26.7
## explicit
# k8s.io/client-go v0.26.2
# k8s.io/client-go v0.26.7
## explicit
# k8s.io/klog/v2 v2.90.1
## explicit
Expand All @@ -364,4 +330,3 @@
## explicit
# sigs.k8s.io/yaml v1.3.0
## explicit
# github.com/cucumber/godog => github.com/laurazard/godog v0.0.0-20220922095256-4c4b17abdae7

0 comments on commit 7dade50

Please sign in to comment.