Skip to content

Commit 865af65

Browse files
csotirioucsotiriou
committed
Merge branch 'master' into feature/increase-name-limits
2 parents 81797ac + 8e5f240 commit 865af65

File tree

366 files changed

+50285
-11110
lines changed

Some content is hidden

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

366 files changed

+50285
-11110
lines changed

‎.asf.yaml‎

Lines changed: 150 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -16,145 +16,154 @@
1616
#
1717

1818
github:
19-
description: The Cloud-Native API Gateway
20-
homepage: https://apisix.apache.org/blog/
21-
labels:
22-
- api-gateway
23-
- cloud-native
24-
- nginx
25-
- luajit
26-
- apigateway
27-
- microservices
28-
- api
29-
- apis
30-
- loadbalancing
31-
- reverse-proxy
32-
- api-management
33-
- apisix
34-
- serverless
35-
- iot
36-
- devops
37-
- kubernetes
38-
- docker
39-
- kubernetes-ingress
40-
- kubernetes-ingress-controller
41-
- service-mesh
19+
description: The Cloud-Native API Gateway and AI Gateway
20+
homepage: https://apisix.apache.org/blog/
21+
labels:
22+
- api-gateway
23+
- ai-gateway
24+
- ai
25+
- cloud-native
26+
- nginx
27+
- luajit
28+
- apigateway
29+
- microservices
30+
- api
31+
- apis
32+
- loadbalancing
33+
- reverse-proxy
34+
- api-management
35+
- apisix
36+
- serverless
37+
- iot
38+
- devops
39+
- kubernetes
40+
- docker
41+
- kubernetes-ingress
42+
- kubernetes-ingress-controller
43+
44+
enabled_merge_buttons:
45+
squash: true
46+
# **WARNING**: rebase should only be used
47+
# when backport multiple commits to the `release/xx` branch
48+
rebase: true
49+
merge: false
50+
51+
protected_branches:
52+
master:
53+
required_pull_request_reviews:
54+
dismiss_stale_reviews: true
55+
require_code_owner_reviews: true
56+
required_approving_review_count: 3
57+
release/3.13:
58+
required_pull_request_reviews:
59+
require_code_owner_reviews: true
60+
required_approving_review_count: 3
61+
release/3.12:
62+
required_pull_request_reviews:
63+
require_code_owner_reviews: true
64+
required_approving_review_count: 3
65+
release/3.11:
66+
required_pull_request_reviews:
67+
require_code_owner_reviews: true
68+
required_approving_review_count: 3
69+
release/3.10:
70+
required_pull_request_reviews:
71+
require_code_owner_reviews: true
72+
required_approving_review_count: 3
73+
release/3.9:
74+
required_pull_request_reviews:
75+
require_code_owner_reviews: true
76+
required_approving_review_count: 2
77+
release/3.8:
78+
required_pull_request_reviews:
79+
require_code_owner_reviews: true
80+
required_approving_review_count: 2
81+
release/3.7:
82+
required_pull_request_reviews:
83+
require_code_owner_reviews: true
84+
required_approving_review_count: 2
85+
release/3.6:
86+
required_pull_request_reviews:
87+
require_code_owner_reviews: true
88+
required_approving_review_count: 2
89+
release/3.5:
90+
required_pull_request_reviews:
91+
require_code_owner_reviews: true
92+
required_approving_review_count: 2
93+
release/3.4:
94+
required_pull_request_reviews:
95+
require_code_owner_reviews: true
96+
required_approving_review_count: 2
97+
release/3.3:
98+
required_pull_request_reviews:
99+
require_code_owner_reviews: true
100+
required_approving_review_count: 2
101+
release/3.2:
102+
required_pull_request_reviews:
103+
require_code_owner_reviews: true
104+
required_approving_review_count: 2
105+
release/3.1:
106+
required_pull_request_reviews:
107+
require_code_owner_reviews: true
108+
required_approving_review_count: 2
109+
release/3.0:
110+
required_pull_request_reviews:
111+
require_code_owner_reviews: true
112+
required_approving_review_count: 2
113+
release/2.99:
114+
required_pull_request_reviews:
115+
require_code_owner_reviews: true
116+
required_approving_review_count: 2
117+
release/2.15:
118+
required_pull_request_reviews:
119+
require_code_owner_reviews: true
120+
required_approving_review_count: 2
121+
release/2.14:
122+
required_pull_request_reviews:
123+
require_code_owner_reviews: true
124+
required_approving_review_count: 2
125+
release/2.13:
126+
required_pull_request_reviews:
127+
require_code_owner_reviews: true
128+
required_approving_review_count: 2
129+
release/2.12:
130+
required_pull_request_reviews:
131+
require_code_owner_reviews: true
132+
required_approving_review_count: 2
133+
release/2.11:
134+
required_pull_request_reviews:
135+
require_code_owner_reviews: true
136+
required_approving_review_count: 2
137+
release/2.10:
138+
required_pull_request_reviews:
139+
require_code_owner_reviews: true
140+
required_approving_review_count: 2
141+
release/2.9:
142+
required_pull_request_reviews:
143+
require_code_owner_reviews: true
144+
required_approving_review_count: 2
145+
release/2.8:
146+
required_pull_request_reviews:
147+
require_code_owner_reviews: true
148+
required_approving_review_count: 2
149+
release/2.7:
150+
required_pull_request_reviews:
151+
require_code_owner_reviews: true
152+
required_approving_review_count: 2
153+
release/2.6:
154+
required_pull_request_reviews:
155+
require_code_owner_reviews: true
156+
required_approving_review_count: 2
157+
release/2.5:
158+
required_pull_request_reviews:
159+
require_code_owner_reviews: true
160+
required_approving_review_count: 2
161+
release/2.4:
162+
required_pull_request_reviews:
163+
require_code_owner_reviews: true
164+
required_approving_review_count: 2
42165

43-
enabled_merge_buttons:
44-
squash: true
45-
# **WARNING**: rebase should only be used
46-
# when backport multiple commits to the `release/xx` branch
47-
rebase: true
48-
merge: false
49-
50-
protected_branches:
51-
master:
52-
required_pull_request_reviews:
53-
dismiss_stale_reviews: true
54-
require_code_owner_reviews: true
55-
required_approving_review_count: 3
56-
release/3.11:
57-
required_pull_request_reviews:
58-
require_code_owner_reviews: true
59-
required_approving_review_count: 3
60-
release/3.10:
61-
required_pull_request_reviews:
62-
require_code_owner_reviews: true
63-
required_approving_review_count: 3
64-
release/3.9:
65-
required_pull_request_reviews:
66-
require_code_owner_reviews: true
67-
required_approving_review_count: 2
68-
release/3.8:
69-
required_pull_request_reviews:
70-
require_code_owner_reviews: true
71-
required_approving_review_count: 2
72-
release/3.7:
73-
required_pull_request_reviews:
74-
require_code_owner_reviews: true
75-
required_approving_review_count: 2
76-
release/3.6:
77-
required_pull_request_reviews:
78-
require_code_owner_reviews: true
79-
required_approving_review_count: 2
80-
release/3.5:
81-
required_pull_request_reviews:
82-
require_code_owner_reviews: true
83-
required_approving_review_count: 2
84-
release/3.4:
85-
required_pull_request_reviews:
86-
require_code_owner_reviews: true
87-
required_approving_review_count: 2
88-
release/3.3:
89-
required_pull_request_reviews:
90-
require_code_owner_reviews: true
91-
required_approving_review_count: 2
92-
release/3.2:
93-
required_pull_request_reviews:
94-
require_code_owner_reviews: true
95-
required_approving_review_count: 2
96-
release/3.1:
97-
required_pull_request_reviews:
98-
require_code_owner_reviews: true
99-
required_approving_review_count: 2
100-
release/3.0:
101-
required_pull_request_reviews:
102-
require_code_owner_reviews: true
103-
required_approving_review_count: 2
104-
release/2.99:
105-
required_pull_request_reviews:
106-
require_code_owner_reviews: true
107-
required_approving_review_count: 2
108-
release/2.15:
109-
required_pull_request_reviews:
110-
require_code_owner_reviews: true
111-
required_approving_review_count: 2
112-
release/2.14:
113-
required_pull_request_reviews:
114-
require_code_owner_reviews: true
115-
required_approving_review_count: 2
116-
release/2.13:
117-
required_pull_request_reviews:
118-
require_code_owner_reviews: true
119-
required_approving_review_count: 2
120-
release/2.12:
121-
required_pull_request_reviews:
122-
require_code_owner_reviews: true
123-
required_approving_review_count: 2
124-
release/2.11:
125-
required_pull_request_reviews:
126-
require_code_owner_reviews: true
127-
required_approving_review_count: 2
128-
release/2.10:
129-
required_pull_request_reviews:
130-
require_code_owner_reviews: true
131-
required_approving_review_count: 2
132-
release/2.9:
133-
required_pull_request_reviews:
134-
require_code_owner_reviews: true
135-
required_approving_review_count: 2
136-
release/2.8:
137-
required_pull_request_reviews:
138-
require_code_owner_reviews: true
139-
required_approving_review_count: 2
140-
release/2.7:
141-
required_pull_request_reviews:
142-
require_code_owner_reviews: true
143-
required_approving_review_count: 2
144-
release/2.6:
145-
required_pull_request_reviews:
146-
require_code_owner_reviews: true
147-
required_approving_review_count: 2
148-
release/2.5:
149-
required_pull_request_reviews:
150-
require_code_owner_reviews: true
151-
required_approving_review_count: 2
152-
release/2.4:
153-
required_pull_request_reviews:
154-
require_code_owner_reviews: true
155-
required_approving_review_count: 2
156-
157-
notifications:
158-
commits: [email protected]
159-
issues: [email protected]
160-
pullrequests: [email protected]
166+
notifications:
167+
commits: [email protected]
168+
issues: [email protected]
169+
pullrequests: [email protected]

‎.devcontainer/Dockerfile‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
FROM ubuntu:24.04
19+
20+
RUN apt update && export DEBIAN_FRONTEND=noninteractive \
21+
&& apt install -y sudo git make gcc tini
22+
23+
COPY Makefile .requirements apisix-master-0.rockspec ./
24+
COPY utils/install-dependencies.sh utils/linux-install-luarocks.sh utils/
25+
26+
RUN make install-runtime
27+
28+
RUN cpanm --notest Test::Nginx IPC::Run > build.log 2>&1 || (cat build.log && exit 1)
29+
30+
ARG ETCD_VER=v3.5.17
31+
ARG BUILDARCH
32+
RUN curl -L https://github.com/etcd-io/etcd/releases/download/${ETCD_VER}/etcd-${ETCD_VER}-linux-${BUILDARCH}.tar.gz -o /tmp/etcd-${ETCD_VER}-linux-${BUILDARCH}.tar.gz \
33+
&& mkdir -p /tmp/etcd-download-test \
34+
&& tar xzvf /tmp/etcd-${ETCD_VER}-linux-${BUILDARCH}.tar.gz -C /tmp/etcd-download-test --strip-components=1 \
35+
&& mv /tmp/etcd-download-test/etcdctl /usr/bin \
36+
&& rm -rf /tmp/*
37+
38+
ENTRYPOINT [ "tini", "--" ]

‎.devcontainer/devcontainer.json‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"name": "APISIX",
3+
"dockerComposeFile": ["docker-compose.yml"],
4+
"service": "apisix",
5+
"workspaceFolder": "/workspace",
6+
"privileged": true,
7+
"postCreateCommand": "bash -c 'cd /workspace && rm -rf test-nginx && git config --global --add safe.directory /workspace && git submodule update --init --recursive && git clone https://github.com/openresty/test-nginx.git --depth 1 --single-branch -b master && make deps'",
8+
"customizations": {
9+
"vscode": {
10+
"extensions": ["ms-vscode.makefile-tools", "ms-azuretools.vscode-docker", "sumneko.lua"]
11+
}
12+
},
13+
"forwardPorts": [9080, 9180, 2379]
14+
}

‎.devcontainer/docker-compose.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one or more
3+
# contributor license agreements. See the NOTICE file distributed with
4+
# this work for additional information regarding copyright ownership.
5+
# The ASF licenses this file to You under the Apache License, Version 2.0
6+
# (the "License"); you may not use this file except in compliance with
7+
# the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing, software
12+
# distributed under the License is distributed on an "AS IS" BASIS,
13+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
# See the License for the specific language governing permissions and
15+
# limitations under the License.
16+
#
17+
18+
services:
19+
apisix:
20+
build:
21+
context: ..
22+
dockerfile: .devcontainer/Dockerfile
23+
command: sleep infinity
24+
volumes:
25+
- ..:/workspace:cached
26+
network_mode: service:etcd
27+
etcd:
28+
image: bitnami/etcd:3.5
29+
volumes:
30+
- etcd_data:/bitnami/etcd
31+
environment:
32+
ALLOW_NONE_AUTHENTICATION: "yes"
33+
ETCD_ADVERTISE_CLIENT_URLS: "http://127.0.0.1:2379"
34+
ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"
35+
36+
volumes:
37+
etcd_data:

0 commit comments

Comments
 (0)