Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: CI
on:
push:
branches:
- 'main'
- 'dev-v2'
- 'release-*'
paths-ignore:
- "**.md"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ on:
branches:
- main
- release-*
- v3
- dev-v2
pull_request:
# The branches below must be a subset of the branches above
branches:
- main
- v3
- dev-v2
paths-ignore:
- '**/vendor'
merge_group:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
branches:
- main
- release-*
- v3
- dev-v2
merge_group:

concurrency:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
push:
branches:
- main
- v3
- dev-v2

# Declare default permissions as read only.
permissions: read-all
Expand Down
8 changes: 4 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ The following is a set of guidelines for contributing to the NGINX Agent. We rea

[Code Guidelines](#code-guidelines)

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

## Getting Started

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

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

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

* 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.
* Fill in [our pull request template](https://github.com/nginx/agent/blob/main/.github/pull_request_template.md).
* Fill in [our pull request template](https://github.com/nginx/agent/blob/dev-v2/.github/pull_request_template.md).

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.

### F5 Contributor License Agreement (CLA)

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))
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))
before any of their changes can be incorporated into an F5 Open Source repository.

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
Expand Down
2 changes: 1 addition & 1 deletion test/docker/nginx-official-image/deb/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ COPY ./build/${PACKAGE_NAME}.${CONTAINER_OS_TYPE} /agent/build/${PACKAGE_NAME}.$
COPY ./ /agent

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

RUN unlink /var/log/nginx/access.log
Expand Down
Loading