Skip to content

Commit ab12cf4

Browse files
GasoidGasoid
committed
Merge branch 'main' of github.com:nginx/nginx-gateway-fabric into feat/hostPort
2 parents 8317ade + 5e77415 commit ab12cf4

File tree

160 files changed

+2522
-219
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+2522
-219
lines changed

‎.github/CHANGELOG_TEMPLATE.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ COMPATIBILITY:
3232
- Gateway API version: ``
3333
- NGINX version: ``
3434
- NGINX Plus version: ``
35+
- NGINX Agent version: ``
3536
- Kubernetes version: ``
3637

3738
CONTAINER IMAGES:

‎.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ jobs:
171171
fail-build: false
172172

173173
- name: Upload scan result to GitHub Security tab
174-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
174+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
175175
continue-on-error: true
176176
with:
177177
sarif_file: ${{ steps.scan.outputs.sarif }}

‎.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ jobs:
149149
.github/.cache/buster-for-binary
150150
151151
- name: Create/Update Draft
152-
uses: lucacome/draft-release@f15262dc3ac8c3efbf09a8ce5406cd0fc47aabb1 # v1.2.2
152+
uses: lucacome/draft-release@38def8b74645796e9743b53e0f187d4a8915ea3e # v1.2.3
153153
with:
154154
minor-label: "enhancement"
155155
major-label: "change"

‎.github/workflows/codeql-analysis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ jobs:
2626
actions: read # for github/codeql-action/init to get workflow details
2727
contents: read # for actions/checkout to fetch code
2828
security-events: write # for github/codeql-action/autobuild to send a status report
29-
uses: nginxinc/compliance-rules/.github/workflows/codeql.yml@c903bfe6c668eaba362cde6a7882278bc1564401 # v0.1
29+
uses: nginxinc/compliance-rules/.github/workflows/codeql.yml@a27656f8f9a8748085b434ebe007f5b572709aad # v0.2
3030
with:
31-
requested_languages: go,javascript-typescript
31+
requested_languages: go,javascript-typescript,actions

‎.github/workflows/lint.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ jobs:
114114
- name: Set up chart-testing
115115
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
116116
with:
117-
version: 3.12.0 # renovate: datasource=github-tags depName=helm/chart-testing
117+
version: 3.13.0 # renovate: datasource=github-tags depName=helm/chart-testing
118118

119119
- name: Run chart-testing
120120
run: ct lint --print-config --config .ct.yaml

‎.github/workflows/mend.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ permissions:
3131

3232
jobs:
3333
mend:
34-
if: ${{ github.event.repository.fork == false }}
35-
uses: nginxinc/compliance-rules/.github/workflows/mend.yml@c903bfe6c668eaba362cde6a7882278bc1564401 # v0.1
34+
if: ${{ (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false) || (github.event_name == 'push' && github.event.repository.fork == false) }}
35+
uses: nginxinc/compliance-rules/.github/workflows/mend.yml@a27656f8f9a8748085b434ebe007f5b572709aad # v0.2
3636
secrets: inherit
3737
with:
3838
product_name: nginx-gateway-fabric_${{ github.ref_name }}

‎.github/workflows/release-pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535

3636
- name: Get Release Notes
3737
id: notes
38-
uses: lucacome/draft-release@f15262dc3ac8c3efbf09a8ce5406cd0fc47aabb1 # v1.2.2
38+
uses: lucacome/draft-release@38def8b74645796e9743b53e0f187d4a8915ea3e # v1.2.3
3939
with:
4040
config-path: .github/release-notes.yml
4141
dry-run: true

‎.github/workflows/scorecards.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
persist-credentials: false
3535

3636
- name: "Run analysis"
37-
uses: ossf/scorecard-action@f49aabe0b5af0936a0987cfb85d86b75731b0186 # v2.4.1
37+
uses: ossf/scorecard-action@05b42c624433fc40578a4040d5cf5e36ddca8cde # v2.4.2
3838
with:
3939
results_file: results.sarif
4040
results_format: sarif
@@ -60,6 +60,6 @@ jobs:
6060

6161
# Upload the results to GitHub's code scanning dashboard.
6262
- name: "Upload to code-scanning"
63-
uses: github/codeql-action/upload-sarif@ff0a06e83cb2de871e5a09832bc6a81e7276941f # v3.28.18
63+
uses: github/codeql-action/upload-sarif@fca7ace96b7d713c7035871441bd52efbe39e27e # v3.28.19
6464
with:
6565
sarif_file: results.sarif

‎.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ repos:
2727
exclude: (^examples/|^docs/|.*_test.go$)
2828

2929
- repo: https://github.com/gitleaks/gitleaks
30-
rev: v8.26.0
30+
rev: v8.27.2
3131
hooks:
3232
- id: gitleaks
3333

‎CHANGELOG.md

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,76 @@ This document includes a curated changelog for each release. We also publish a c
44
a [GitHub release](https://github.com/nginx/nginx-gateway-fabric/releases), which, by contrast, is auto-generated
55
and includes links to all PRs that went into the release.
66

7+
## Release 2.0.0
8+
9+
_June 5, 2025_
10+
11+
BREAKING CHANGES:
12+
13+
[How to upgrade to 2.0.0](https://docs.nginx.com/nginx-gateway-fabric/install/upgrade-version/#upgrade-from-v1x-to-v2x).
14+
15+
The following changes are breaking and require users to fully uninstall NGINX Gateway Fabric (including NGINX Gateway Fabric CRDs) before re-installing the new version. Gateway API resources (such as Gateway, HTTPRoute, etc) are unaffected and can be left alone. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
16+
17+
- Control plane and data plane have been separated into different Deployments. The control plane will provision an NGINX data plane Deployment and Service when a Gateway object is created.
18+
- NginxProxy CRD resource is now namespace-scoped (was cluster-scoped).
19+
- NginxProxy resource controls infrastructure fields for the NGINX Deployment and Service, such as replicas, loadBalancerIP, serviceType, etc. Users who want to set or update these fields must do so either at installation time through the helm chart (which sets them globally), or per Gateway. Updating these fields directly on a provisioned nginx Deployment or Service will not take effect. This does not apply to the the NGINX Gateway Fabric control plane Deployment.
20+
- Helm values structure has changed slightly to better support the separate Deployments.
21+
- `nginxGateway.replicaCount` Helm value has been renamed to `nginxGateway.replicas`.
22+
23+
FEATURES:
24+
25+
- Support for creating and deploying multiple Gateways. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
26+
- NginxProxy resource can now additionally be attached to a Gateway, and will overwrite any settings that are attached at the GatewayClass level, for the Gateway that it's attached to. [3318](https://github.com/nginx/nginx-gateway-fabric/pull/3318)
27+
- Listener isolation supported for all routes. [3067](https://github.com/nginx/nginx-gateway-fabric/pull/3067)
28+
- Allow configuration of NGINX Plus API access. [3066](https://github.com/nginx/nginx-gateway-fabric/pull/3066)
29+
- Adds regex matching for headers and query params for HTTPRoutes and headers for GRPCRoutes. [3093](https://github.com/nginx/nginx-gateway-fabric/pull/3093)
30+
- Add support for request mirroring using the RequestMirror filter. [3066](https://github.com/nginx/nginx-gateway-fabric/pull/3306)
31+
- Adds support for Secrets to be used in BackendTLSPolicy for TLS certificates and CA certificates. [3084](https://github.com/nginx/nginx-gateway-fabric/pull/3084). Thanks to [porthorian](https://github.com/porthorian).
32+
33+
BUG FIXES:
34+
35+
- Fix an issue where default headers were still being set when overwritten by a user. [3249](https://github.com/nginx/nginx-gateway-fabric/pull/3249)
36+
- Add 503 status code when there are zero upstream endpoints. [3406](https://github.com/nginx/nginx-gateway-fabric/pull/3406)
37+
- Fixed bug that occurred when a route's ParentRef does not include a sectionName and the Gateway's listeners have duplicate hostnames. This would cause conflicts when the route tries to attach to all the listeners and falsely trigger validation checks around overlapping routes. [3418](https://github.com/nginx/nginx-gateway-fabric/pull/3418)
38+
39+
DOCUMENTATION:
40+
41+
- Migrated the documentation website into the [NGINX documentation repository](https://github.com/nginx/documentation). [3047](https://github.com/nginx/nginx-gateway-fabric/pull/3047)
42+
43+
HELM CHART:
44+
45+
- The version of the Helm chart is now 2.0.0
46+
- Helm values structure has changed slightly to better support the separate Deployments.
47+
- `nginxGateway.replicaCount` Helm value has been renamed to `nginxGateway.replicas`.
48+
- Add support for control plane Deployment labels. [3194](https://github.com/nginx/nginx-gateway-fabric/pull/3194). Thanks to [Butterneck](https://github.com/Butterneck).
49+
50+
UPGRADE:
51+
52+
- [Upgrade to 2.0.0](https://docs.nginx.com/nginx-gateway-fabric/install/upgrade-version/#upgrade-from-v1x-to-v2x)
53+
54+
KNOWN ISSUES:
55+
56+
- NGINX LoadBalancer Service IPFamily uses Kubernetes default (likely SingleStack IPv4) instead of matching the ipFamily set in the NginxProxy resource, which defaults to DualStack. [3473](https://github.com/nginx/nginx-gateway-fabric/issues/3473)
57+
58+
DEPENDENCIES:
59+
60+
- NGINX Plus was updated to R34. [3281](https://github.com/nginx/nginx-gateway-fabric/pull/3281)
61+
- Update to v1.3.0 of the Gateway API. [3348](https://github.com/nginx/nginx-gateway-fabric/pull/3348)
62+
63+
COMPATIBILITY:
64+
65+
- Gateway API version: `1.3.0`
66+
- NGINX version: `1.28.0`
67+
- NGINX Plus version: `R34`
68+
- NGINX Agent version: `v3.0.0`
69+
- Kubernetes version: `1.25+`
70+
71+
CONTAINER IMAGES:
72+
73+
- Control plane: `ghcr.io/nginx/nginx-gateway-fabric:2.0.0`
74+
- Data plane: `ghcr.io/nginx/nginx-gateway-fabric/nginx:2.0.0`
75+
- Data plane with NGINX Plus: `private-registry.nginx.com/nginx-gateway-fabric/nginx-plus:2.0.0`
76+
777
## Release 1.6.2
878

979
_March 11, 2025_

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Reserve GitHub issues for feature requests and bugs rather than general question
3232

3333
## Getting Started
3434

35-
Follow our [Installation Instructions](https://docs.nginx.com/nginx-gateway-fabric/installation/) to get the NGINX Gateway Fabric up and running.
35+
Follow our [Installation Instructions](https://docs.nginx.com/nginx-gateway-fabric/install/) to get the NGINX Gateway Fabric up and running.
3636

3737
### Project Structure
3838

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ CONTROLLER_TOOLS_VERSION = v0.18.0
3535
# renovate: datasource=docker depName=node
3636
NODE_VERSION = 22
3737
# renovate: datasource=docker depName=quay.io/helmpack/chart-testing
38-
CHART_TESTING_VERSION = v3.12.0
38+
CHART_TESTING_VERSION = v3.13.0
3939
# renovate: datasource=github-tags depName=dadav/helm-schema
4040
HELM_SCHEMA_VERSION = 0.18.1
4141

‎README.md

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ the [Gateway API Compatibility](https://docs.nginx.com/nginx-gateway-fabric/over
2020

2121
Learn about our [design principles](/docs/developer/design-principles.md) and [architecture](https://docs.nginx.com/nginx-gateway-fabric/overview/gateway-architecture/).
2222

23+
NGINX Gateway Fabric uses [NGINX Agent](https://github.com/nginx/agent) to configure NGINX.
24+
2325
## Getting Started
2426

2527
1. [Get started using a kind cluster](https://docs.nginx.com/nginx-gateway-fabric/get-started/).
26-
2. [Install](https://docs.nginx.com/nginx-gateway-fabric/installation/) NGINX Gateway Fabric.
28+
2. [Install](https://docs.nginx.com/nginx-gateway-fabric/install/) NGINX Gateway Fabric.
2729
3. Deploy various [examples](examples).
28-
4. Read our [How-to guides](https://docs.nginx.com/nginx-gateway-fabric/how-to/).
30+
4. Follow instructions for common use cases such as [routing](https://docs.nginx.com/nginx-gateway-fabric/traffic-management/) and [securing](https://docs.nginx.com/nginx-gateway-fabric/traffic-security/) traffic, or [monitoring](https://docs.nginx.com/nginx-gateway-fabric//monitoring/) your cluster.
2931

3032
You can find the comprehensive NGINX Gateway Fabric user documentation on the [NGINX Documentation](https://docs.nginx.com/nginx-gateway-fabric/) website.
3133

@@ -34,7 +36,7 @@ You can find the comprehensive NGINX Gateway Fabric user documentation on the [N
3436
We publish NGINX Gateway Fabric releases on GitHub. See
3537
our [releases page](https://github.com/nginx/nginx-gateway-fabric/releases).
3638

37-
The latest release is [1.6.2](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v1.6.2).
39+
The latest release is [2.0.0](https://github.com/nginx/nginx-gateway-fabric/releases/tag/v2.0.0).
3840

3941
The edge version is useful for experimenting with new features that are not yet published in a release. To use, choose
4042
the _edge_ version built from the [latest commit](https://github.com/nginx/nginx-gateway-fabric/commits/main)
@@ -45,7 +47,7 @@ to the correct versions:
4547

4648
| Version | Description | Installation Manifests | Documentation and Examples |
4749
|----------------|------------------------------------------|--------------------------------------------------------------------------------|----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
48-
| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.2/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v1.6.2/examples). |
50+
| Latest release | For production use | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/v2.0.0/deploy). | [Documentation](https://docs.nginx.com/nginx-gateway-fabric). [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/v2.0.0/examples). |
4951
| Edge | For experimental use and latest features | [Manifests](https://github.com/nginx/nginx-gateway-fabric/tree/main/deploy). | [Examples](https://github.com/nginx/nginx-gateway-fabric/tree/main/examples). |
5052

5153
### Versioning
@@ -64,19 +66,20 @@ the [Issue Lifecycle](ISSUE_LIFECYCLE.md) document for information on issue crea
6466

6567
The following table lists the software versions NGINX Gateway Fabric supports.
6668

67-
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus |
68-
|----------------------|-------------|------------|-----------|------------|
69-
| Edge | 1.3.0 | 1.25+ | 1.28.0 | R34 |
70-
| 1.6.2 | 1.2.1 | 1.25+ | 1.27.4 | R33 |
71-
| 1.6.1 | 1.2.1 | 1.25+ | 1.27.4 | R33 |
72-
| 1.6.0 | 1.2.1 | 1.25+ | 1.27.3 | R33 |
73-
| 1.5.1 | 1.2.0 | 1.25+ | 1.27.2 | R33 |
74-
| 1.5.0 | 1.2.0 | 1.25+ | 1.27.2 | R33 |
75-
| 1.4.0 | 1.1.0 | 1.25+ | 1.27.1 | R32 |
76-
| 1.3.0 | 1.1.0 | 1.25+ | 1.27.0 | R32 |
77-
| 1.2.0 | 1.0.0 | 1.23+ | 1.25.4 | R31 |
78-
| 1.1.0 | 1.0.0 | 1.23+ | 1.25.3 | n/a |
79-
| 1.0.0 | 0.8.1 | 1.23+ | 1.25.2 | n/a |
69+
| NGINX Gateway Fabric | Gateway API | Kubernetes | NGINX OSS | NGINX Plus | NGINX Agent |
70+
|----------------------|-------------|------------|-----------|------------|-------------|
71+
| Edge | 1.3.0 | 1.25+ | 1.28.0 | R34 | v3.0.0 |
72+
| 2.0.0 | 1.3.0 | 1.25+ | 1.28.0 | R34 | v3.0.0 |
73+
| 1.6.2 | 1.2.1 | 1.25+ | 1.27.4 | R33 | --- |
74+
| 1.6.1 | 1.2.1 | 1.25+ | 1.27.4 | R33 | --- |
75+
| 1.6.0 | 1.2.1 | 1.25+ | 1.27.3 | R33 | --- |
76+
| 1.5.1 | 1.2.0 | 1.25+ | 1.27.2 | R33 | --- |
77+
| 1.5.0 | 1.2.0 | 1.25+ | 1.27.2 | R33 | --- |
78+
| 1.4.0 | 1.1.0 | 1.25+ | 1.27.1 | R32 | --- |
79+
| 1.3.0 | 1.1.0 | 1.25+ | 1.27.0 | R32 | --- |
80+
| 1.2.0 | 1.0.0 | 1.23+ | 1.25.4 | R31 | --- |
81+
| 1.1.0 | 1.0.0 | 1.23+ | 1.25.3 | n/a | --- |
82+
| 1.0.0 | 0.8.1 | 1.23+ | 1.25.2 | n/a | --- |
8083

8184
## SBOM (Software Bill of Materials)
8285

@@ -103,7 +106,7 @@ docker buildx imagetools inspect ghcr.io/nginx/nginx-gateway-fabric:edge --forma
103106

104107
## Troubleshooting
105108

106-
For troubleshooting help, see the [Troubleshooting](https://docs.nginx.com/nginx-gateway-fabric/how-to/monitoring/troubleshooting/) document.
109+
For troubleshooting help, see the [Troubleshooting](https://docs.nginx.com/nginx-gateway-fabric/troubleshooting/) document.
107110

108111
## Contacts
109112

@@ -133,4 +136,4 @@ Please read our [Contributing guide](CONTRIBUTING.md) if you'd like to contribut
133136

134137
If your team needs dedicated support for NGINX Gateway Fabric in your environment, or you would like to leverage our [advanced NGINX Plus features](https://docs.nginx.com/nginx-gateway-fabric/overview/nginx-plus/), you can reach out [here](https://www.f5.com/content/f5-com/en_us/products/get-f5).
135138

136-
To try NGINX Gateway Fabric with NGINX Plus, you can start your free [30-day trial](https://www.f5.com/trials), then follow the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/installation/installing-ngf/helm/) for installing with NGINX Plus.
139+
To try NGINX Gateway Fabric with NGINX Plus, you can start your free [30-day trial](https://www.f5.com/trials), then follow the [installation guide](https://docs.nginx.com/nginx-gateway-fabric/install/helm/) for installing with NGINX Plus.

‎build/Dockerfile.nginx

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,33 @@
11
# syntax=docker/dockerfile:1.16
2-
# TODO(sberman): the commented out lines are for when we use the published agent release
3-
# FROM scratch AS nginx-files
2+
FROM scratch AS nginx-files
43

5-
# # the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
6-
# ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
7-
8-
FROM golang:alpine AS builder
9-
10-
WORKDIR /tmp
11-
12-
RUN apk add --no-cache git make \
13-
&& git clone https://github.com/nginx/agent.git \
14-
&& cd agent \
15-
&& git checkout 3dad26582af6c17e013302d08a4f1ed5d5504296 \
16-
&& make build
4+
# the following links can be replaced with local files if needed, i.e. ADD --chown=101:1001 <local_file> <container_file>
5+
ADD --link --chown=101:1001 https://cs.nginx.com/static/keys/nginx_signing.rsa.pub nginx_signing.rsa.pub
176

187
FROM nginx:1.28.0-alpine-otel
198

9+
# renovate: datasource=github-tags depName=nginx/agent extractVersion=^v?(?<version>.*)$
10+
ARG NGINX_AGENT_VERSION=3.0.0
2011
ARG NJS_DIR
2112
ARG NGINX_CONF_DIR
2213
ARG BUILD_AGENT
2314

24-
# RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \
25-
# printf "%s\n" "http://packages.nginx.org/nginx-agent/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
26-
# && apk add --no-cache nginx-agent
15+
RUN --mount=type=bind,from=nginx-files,src=nginx_signing.rsa.pub,target=/etc/apk/keys/nginx_signing.rsa.pub \
16+
printf "%s\n" "https://packages.nginx.org/nginx-agent/alpine/v$(egrep -o '^[0-9]+\.[0-9]+' /etc/alpine-release)/main" >> /etc/apk/repositories \
17+
&& apk add --no-cache nginx-agent=${NGINX_AGENT_VERSION}
2718

2819
RUN apk add --no-cache libcap bash \
2920
&& mkdir -p /usr/lib/nginx/modules \
3021
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx \
3122
&& setcap -v 'cap_net_bind_service=+ep' /usr/sbin/nginx \
3223
&& setcap 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
3324
&& setcap -v 'cap_net_bind_service=+ep' /usr/sbin/nginx-debug \
34-
&& apk del libcap
35-
36-
COPY --from=builder /tmp/agent/build/nginx-agent /usr/bin/nginx-agent
25+
# Update packages for CVE-2025-32414 and CVE-2025-32415
26+
&& apk --no-cache upgrade libxml2 \
27+
&& apk del libcap \
28+
# forward request and error logs to docker log collector
29+
&& ln -sf /dev/stdout /var/log/nginx/access.log \
30+
&& ln -sf /dev/stderr /var/log/nginx/error.log
3731

3832
COPY build/entrypoint.sh /agent/entrypoint.sh
3933
COPY ${NJS_DIR}/httpmatches.js /usr/lib/nginx/modules/njs/httpmatches.js

0 commit comments

Comments
 (0)