Skip to content

Commit 352f44b

Browse files
authored
Update branch name references from main to dev-v2 (#1112)
1 parent 52532e1 commit 352f44b

File tree

6 files changed

+10
-10
lines changed

6 files changed

+10
-10
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: CI
33
on:
44
push:
55
branches:
6-
- 'main'
6+
- 'dev-v2'
77
- 'release-*'
88
paths-ignore:
99
- "**.md"

.github/workflows/codeql.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ on:
55
branches:
66
- main
77
- release-*
8-
- v3
8+
- dev-v2
99
pull_request:
1010
# The branches below must be a subset of the branches above
1111
branches:
1212
- main
13-
- v3
13+
- dev-v2
1414
paths-ignore:
1515
- '**/vendor'
1616
merge_group:

.github/workflows/dependency-review.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
branches:
55
- main
66
- release-*
7-
- v3
7+
- dev-v2
88
merge_group:
99

1010
concurrency:

.github/workflows/scorecards.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
push:
1111
branches:
1212
- main
13-
- v3
13+
- dev-v2
1414

1515
# Declare default permissions as read only.
1616
permissions: read-all

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ The following is a set of guidelines for contributing to the NGINX Agent. We rea
1010

1111
[Code Guidelines](#code-guidelines)
1212

13-
[Code of Conduct](https://github.com/nginx/agent/blob/main/docs/CODE_OF_CONDUCT.md)
13+
[Code of Conduct](https://github.com/nginx/agent/blob/dev-v2/docs/CODE_OF_CONDUCT.md)
1414

1515
## Getting Started
1616

17-
Follow our [Installation Guide](https://github.com/nginx/agent/blob/main/README.md#Installation) to get the NGINX Agent up and running.
17+
Follow our [Installation Guide](https://github.com/nginx/agent/blob/dev-v2/README.md#Installation) to get the NGINX Agent up and running.
1818

1919
<!-- ### Project Structure (OPTIONAL) -->
2020

@@ -31,13 +31,13 @@ To suggest a feature or enhancement, please create an issue on GitHub with the l
3131
### Open a Pull Request
3232

3333
* Fork the repo, create a branch, implement your changes, add any relevant tests, submit a PR when your changes are **tested** and ready for review.
34-
* Fill in [our pull request template](https://github.com/nginx/agent/blob/main/.github/pull_request_template.md).
34+
* Fill in [our pull request template](https://github.com/nginx/agent/blob/dev-v2/.github/pull_request_template.md).
3535

3636
Note: if you'd like to implement a new feature, please consider creating a feature request issue first to start a discussion about the feature.
3737

3838
### F5 Contributor License Agreement (CLA)
3939

40-
F5 requires all external contributors to agree to the terms of the F5 CLA (available [here](https://github.com/f5/.github/blob/main/CLA/cla-markdown.md))
40+
F5 requires all external contributors to agree to the terms of the F5 CLA (available [here](https://github.com/f5/.github/blob/dev-v2/CLA/cla-markdown.md))
4141
before any of their changes can be incorporated into an F5 Open Source repository.
4242

4343
If you have not yet agreed to the F5 CLA terms and submit a PR to this repository, a bot will prompt you to view and

test/docker/nginx-official-image/deb/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ COPY ./build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} /agent/build/${PACKAGE_NAME}.$
1515
COPY ./ /agent
1616

1717
RUN apt-get update \
18-
&& apt install --no-install-recommends --no-install-suggests -y /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} \
18+
&& apt install --no-install-recommends --no-install-suggests --allow-downgrades -y /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} \
1919
&& rm /agent/build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE}
2020

2121
RUN unlink /var/log/nginx/access.log

0 commit comments

Comments
 (0)