Skip to content

Commit 52103cc

Browse files
gloursndeloof
authored andcommitted
update README and CI workflows to match main branch
Signed-off-by: Guillaume Lours <[email protected]>
1 parent bfa5408 commit 52103cc

File tree

4 files changed

+11
-11
lines changed

4 files changed

+11
-11
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- 'v2'
10+
- 'main'
1111
tags:
1212
- 'v*'
1313
pull_request:

.github/workflows/merge.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ concurrency:
77
on:
88
push:
99
branches:
10-
- 'v2'
10+
- 'main'
1111
tags:
1212
- 'v*'
1313

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ on:
55
schedule:
66
- cron: '44 9 * * 4'
77
push:
8-
branches: [ "v2" ]
8+
branches: [ "main" ]
99

1010
# Declare default permissions as read only.
1111
permissions: read-all

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@
66
+ [Linux](#linux)
77
- [Quick Start](#quick-start)
88
- [Contributing](#contributing)
9+
- [Legacy](#legacy)
910
# Docker Compose v2
1011

1112
[![GitHub release](https://img.shields.io/github/release/docker/compose.svg?style=flat-square)](https://github.com/docker/compose/releases/latest)
1213
[![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)
13-
[![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)
14+
[![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)
1415
[![Go Report Card](https://goreportcard.com/badge/github.com/docker/compose/v2?style=flat-square)](https://goreportcard.com/report/github.com/docker/compose/v2)
15-
[![Codecov](https://codecov.io/gh/docker/compose/branch/master/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose)
16+
[![Codecov](https://codecov.io/gh/docker/compose/branch/main/graph/badge.svg?token=HP3K4Y4ctu)](https://codecov.io/gh/docker/compose)
1617
[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/docker/compose/badge)](https://api.securityscorecards.dev/projects/github.com/docker/compose)
1718
![Docker Compose](logo.png?raw=true "Docker Compose Logo")
1819

@@ -23,12 +24,6 @@ your application are configured.
2324
Once you have a Compose file, you can create and start your application with a
2425
single command: `docker compose up`.
2526

26-
# About update and backward compatibility
27-
28-
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.
29-
30-
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.
31-
3227
# Where to get Docker Compose
3328

3429
### Windows and macOS
@@ -85,3 +80,8 @@ Want to help develop Docker Compose? Check out our
8580
8681
If you find an issue, please report it on the
8782
[issue tracker](https://github.com/docker/compose/issues/new/choose).
83+
84+
Legacy
85+
-------------
86+
87+
The Python version of Compose is available under the `v1` [branch](https://github.com/docker/compose/tree/v1)

0 commit comments

Comments
 (0)