diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1b4d645f..de36c7da 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ concurrency: on: push: branches: - - 'v2' + - 'main' tags: - 'v*' pull_request: diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 0ccb3514..14bade4a 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -7,7 +7,7 @@ concurrency: on: push: branches: - - 'v2' + - 'main' tags: - 'v*' diff --git a/.github/workflows/scorecards.yml b/.github/workflows/scorecards.yml index d9e63e54..ac4fa981 100644 --- a/.github/workflows/scorecards.yml +++ b/.github/workflows/scorecards.yml @@ -5,7 +5,7 @@ on: schedule: - cron: '44 9 * * 4' push: - branches: [ "v2" ] + branches: [ "main" ] # Declare default permissions as read only. permissions: read-all diff --git a/README.md b/README.md index b6075af3..bd77b277 100644 --- a/README.md +++ b/README.md @@ -6,13 +6,14 @@ + [Linux](#linux) - [Quick Start](#quick-start) - [Contributing](#contributing) +- [Legacy](#legacy) # Docker Compose v2 [![GitHub release](https://img.shields.io/github/release/docker/compose.svg?style=flat-square)](https://github.com/docker/compose/releases/latest) [![PkgGoDev](https://img.shields.io/badge/go.dev-docs-007d9c?style=flat-square&logo=go&logoColor=white)](https://pkg.go.dev/github.com/docker/compose/v2) -[![Build Status](https://img.shields.io/github/workflow/status/docker/compose/ci?label=ci&logo=github&style=flat-square)](https://github.com/docker/compose/actions?query=workflow%3Aci) +[![Build Status](https://img.shields.io/github/actions/workflow/status/docker/compose/ci.yml?label=ci&logo=github&style=flat-square)](https://github.com/docker/compose/actions?query=workflow%3Aci) [![Go Report Card](https://goreportcard.com/badge/github.com/docker/compose/v2?style=flat-square)](https://goreportcard.com/report/github.com/docker/compose/v2) -[![Codecov](https://codecov.io/gh/docker/compose/branch/master/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose) +[![Codecov](https://codecov.io/gh/docker/compose/branch/main/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose) [![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/docker/compose/badge)](https://api.securityscorecards.dev/projects/github.com/docker/compose) ![Docker Compose](logo.png?raw=true "Docker Compose Logo") @@ -23,12 +24,6 @@ your application are configured. Once you have a Compose file, you can create and start your application with a single command: `docker compose up`. -# About update and backward compatibility - -Docker Compose V2 is a major version bump release of Docker Compose. It has been completely rewritten from scratch in Golang (V1 was in Python). The installation instructions for Compose V2 differ from V1. V2 is not a standalone binary anymore, and installation scripts will have to be adjusted. Some commands are different. - -For a smooth transition from legacy docker-compose 1.xx, please consider installing [compose-switch](https://github.com/docker/compose-switch) to translate `docker-compose ...` commands into Compose V2's `docker compose .... `. Also check V2's `--compatibility` flag. - # Where to get Docker Compose ### Windows and macOS @@ -85,3 +80,8 @@ Want to help develop Docker Compose? Check out our If you find an issue, please report it on the [issue tracker](https://github.com/docker/compose/issues/new/choose). + +Legacy +------------- + +The Python version of Compose is available under the `v1` [branch](https://github.com/docker/compose/tree/v1) \ No newline at end of file