Skip to content

Commit b096378

Browse files
committed
Use main instead of master
firecracker-containerd and Firecracker no longer use `master` branch since 435ade4. The links and references must be updated. Signed-off-by: Kazuyoshi Kato <[email protected]>
1 parent 435ade4 commit b096378

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

.github/workflows/build.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: Build
22

33
on:
44
push:
5-
branches: [ master ]
5+
branches: [ main ]
66
pull_request:
7-
branches: [ master ]
7+
branches: [ main ]
88

99
jobs:
1010
build:
@@ -32,7 +32,7 @@ jobs:
3232
#
3333
# While DCO check (on Makefile) checks latest 20 commits,
3434
# the checkout action automatically creates a merge commit
35-
# for merging "master" into a pull request branch.
35+
# for merging "main" into a pull request branch.
3636
# In addition to that, Git cannot recognize merge commits when
3737
# one of the parents is missing.
3838
# So, we will fetch 30 commits just in case to have

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
| Automation | Status |
44
|------------|--------|
5-
| Tests | [![Build status](https://badge.buildkite.com/aab4ae547d5e5079a5915522e8cdb18492349aef67aae5a8c5.svg?branch=master)](https://buildkite.com/firecracker-microvm/firecracker-containerd)
6-
| Lint | [![Build Status](https://travis-ci.org/firecracker-microvm/firecracker-containerd.svg?branch=master)](https://travis-ci.org/firecracker-microvm/firecracker-containerd)
5+
| Tests | [![Build status](https://badge.buildkite.com/aab4ae547d5e5079a5915522e8cdb18492349aef67aae5a8c5.svg?branch=main)](https://buildkite.com/firecracker-microvm/firecracker-containerd)
6+
| Lint | [![Build Status](https://travis-ci.org/firecracker-microvm/firecracker-containerd.svg?branch=main)](https://travis-ci.org/firecracker-microvm/firecracker-containerd)
77

88
This repository enables the use of a container runtime,
99
[containerd](https://containerd.io), to manage
@@ -87,7 +87,7 @@ If you've discovered an issue that may have security implications to
8787
users or developers of this software, please do not report it using
8888
GitHub issues, but instead follow
8989
[Firecracker's security reporting
90-
guidelines](https://github.com/firecracker-microvm/firecracker/blob/master/SECURITY-POLICY.md).
90+
guidelines](https://github.com/firecracker-microvm/firecracker/blob/main/SECURITY-POLICY.md).
9191

9292
Other discussion: For general discussion, please join us in the `#containerd`
9393
channel on the [Firecracker Slack](https://tinyurl.com/firecracker-microvm).

docs/getting-started.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You need to have the following things in order to use firecracker-containerd:
3939
</details>
4040
* git
4141
* A root filesystem image (you can use the one
42-
[described here](https://github.com/firecracker-microvm/firecracker/blob/master/docs/getting-started.md#running-firecracker)
42+
[described here](https://github.com/firecracker-microvm/firecracker/blob/main/docs/getting-started.md#running-firecracker)
4343
as `hello-rootfs.ext4`).
4444
* A recent installation of [Docker CE](https://docker.com).
4545
* Go 1.13 or later, which you can download from [here](https://golang.org/dl/).
@@ -356,7 +356,7 @@ quick summary:
356356
- Sets up firewall rules on the host that allows traffic to/from VMs via the host
357357
network.
358358
* [`tc-redirect-tap` CNI
359-
plugin](https://github.com/firecracker-microvm/firecracker-go-sdk/tree/master/cni)
359+
plugin](https://github.com/firecracker-microvm/firecracker-go-sdk/tree/main/cni)
360360
- A CNI plugin that adapts other CNI plugins to be usable by Firecracker VMs.
361361
[See this doc for more details](networking.md). It is used here to adapt veth
362362
devices created by the `ptp` plugin to tap devices provided to VMs.

examples/taskworkflow.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ $ sudo /path/to/firecracker-containerd/examples/taskworkflow
1515
```
1616

1717
For a workflow with networking setup for the container, create a tap device
18-
for the VM by following [these instructions](https://github.com/firecracker-microvm/firecracker/blob/master/docs/network-setup.md).
18+
for the VM by following [these instructions](https://github.com/firecracker-microvm/firecracker/blob/main/docs/network-setup.md).
1919

2020
This creates a tap device named `tap0`, in the local `172.16.0.1/24` subnet.
2121
Since the example does not rely on a DHCP client running within the VM to

internal/vm/vsock.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ func vsockConnectMsg(port uint32) string {
185185
// The message a host-side connection must write after connecting to a firecracker
186186
// vsock unix socket in order to establish a connection with a guest-side listener
187187
// at the provided port number. This is specified in Firecracker documentation:
188-
// https://github.com/firecracker-microvm/firecracker/blob/master/docs/vsock.md#host-initiated-connections
188+
// https://github.com/firecracker-microvm/firecracker/blob/main/docs/vsock.md#host-initiated-connections
189189
return fmt.Sprintf("CONNECT %d\n", port)
190190
}
191191

@@ -223,7 +223,7 @@ func tryConnect(logger *logrus.Entry, udsPath string, port uint32) (net.Conn, er
223223
}
224224

225225
// The line would be "OK <assigned_hostside_port>\n", but we don't use the hostside port here.
226-
// https://github.com/firecracker-microvm/firecracker/blob/master/docs/vsock.md#host-initiated-connections
226+
// https://github.com/firecracker-microvm/firecracker/blob/main/docs/vsock.md#host-initiated-connections
227227
if !strings.HasPrefix(line, "OK ") {
228228
return nil, vsockAckError{
229229
cause: errors.Errorf(`expected to read "OK <port>", but instead read %q`, line),

tools/docker/Dockerfile.firecracker-builder

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
# Firecracker tends to use latest Rust versions.
1515
# The Rust version below should be matched with
16-
# https://github.com/firecracker-microvm/firecracker/blob/master/tools/devctr/Dockerfile.x86_64.
16+
# https://github.com/firecracker-microvm/firecracker/blob/main/tools/devctr/Dockerfile.x86_64.
1717
FROM rust:1.43.1-buster
1818

1919
ENV DEBIAN_FRONTEND="noninteractive"

0 commit comments

Comments
 (0)