Skip to content

feat(shdict): multi-subsystems lua_shared_dict support #190

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

feat(shdict): multi-subsystems lua_shared_dict support #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a70e92f
feat(shdict): multi-subsystems lua_shared_dict support
tzssangglass May 16, 2022
deb965c
adjust patchs
tzssangglass May 17, 2022
c0d915c
CI test
tzssangglass May 17, 2022
0e7f68f
fix git clone
tzssangglass May 17, 2022
cabbc4d
revert link
tzssangglass May 19, 2022
3fc180f
revert link
tzssangglass May 19, 2022
4f04f47
revert
tzssangglass May 19, 2022
a556e9e
fix new module
tzssangglass May 19, 2022
b466aa7
fix
tzssangglass May 19, 2022
11377c4
build 2.13.1
tzssangglass May 19, 2022
cf3c607
build 2.13.1
tzssangglass May 19, 2022
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/package-apisix-deb-ubuntu20.04.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
timeout-minutes: 60
env:
PACKAGE_APISIX_VERSION: 2.12.0
PACKAGE_APISIX_VERSION: 2.13.1

steps:
- uses: actions/checkout@v2
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/package-apisix-rpm-el7.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: packaging APISIX(-remote) with remote code
run: |
make package type=rpm app=apisix version=2.7 checkout=release/2.7 image_base=centos image_tag=7 artifact=apisix-remote
make package type=rpm app=apisix version=2.10.1 checkout=2.10.1 image_base=centos image_tag=7 artifact=apisix-remote
make package type=rpm app=apisix version=2.13.1 checkout=2.13.1 image_base=centos image_tag=7 artifact=apisix-remote
make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=7 artifact=apisix-remote

- name: packaging APISIX(-local) with local code
Expand Down Expand Up @@ -75,23 +75,23 @@ jobs:
docker exec centos7Instance bash -c "pkill -f nginx"
docker exec centos7Instance bash -c "yum -y erase apisix-remote-master"

- name: install APISIX(-remote) 2.10.1 by rpm in container
- name: install APISIX(-remote) 2.13.1 by rpm in container
run: |
docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-remote-2.10.1-0.el7.x86_64.rpm"
docker exec centos7Instance bash -c "yum -y localinstall /output/apisix-remote-2.13.1-0.el7.x86_64.rpm"
docker exec centos7Instance bash -c "apisix start"

- name: check and ensure APISIX(-remote) 2.10.1 is installed
- name: check and ensure APISIX(-remote) 2.13.1 is installed
run: |
code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/apisix/admin/routes -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1')
if [ ! $code -eq 200 ]; then
echo "failed: failed to install Apache APISIX by rpm"
exit 1
fi

- name: stop and uninstall APISIX(-remote) 2.10.1
- name: stop and uninstall APISIX(-remote) 2.13.1
run: |
docker exec centos7Instance bash -c "pkill -f nginx"
docker exec centos7Instance bash -c "yum -y erase apisix-remote-2.10.1"
docker exec centos7Instance bash -c "yum -y erase apisix-remote-2.13.1"

- name: install APISIX(-local) by rpm in container
run: |
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/package-apisix-rpm-el8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: packaging APISIX(-remote) with remote code
run: |
make package type=rpm app=apisix version=2.7 checkout=release/2.7 image_base=centos image_tag=8 artifact=apisix-remote
make package type=rpm app=apisix version=2.10.1 checkout=2.10.1 image_base=centos image_tag=8 artifact=apisix-remote
make package type=rpm app=apisix version=2.13.1 checkout=2.13.1 image_base=centos image_tag=8 artifact=apisix-remote
make package type=rpm app=apisix version=master checkout=master image_base=centos image_tag=8 artifact=apisix-remote

- name: packaging APISIX(-local) with local code
Expand Down Expand Up @@ -80,23 +80,23 @@ jobs:
docker exec centos8Instance bash -c "pkill -f nginx"
docker exec centos8Instance bash -c "yum -y erase apisix-remote-master"

- name: install APISIX(-remote) 2.10.1 by rpm in container
- name: install APISIX(-remote) 2.13.1 by rpm in container
run: |
docker exec centos8Instance bash -c "yum -y localinstall /output/apisix-remote-2.10.1-0.el8.x86_64.rpm"
docker exec centos8Instance bash -c "yum -y localinstall /output/apisix-remote-2.13.1-0.el8.x86_64.rpm"
docker exec centos8Instance bash -c "apisix start"

- name: check and ensure APISIX(-remote) 2.10.1 is installed
- name: check and ensure APISIX(-remote) 2.13.1 is installed
run: |
code=$(curl -k -i -m 20 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/apisix/admin/routes -H 'X-API-KEY: edd1c9f034335f136f87ad84b625c8f1')
if [ ! $code -eq 200 ]; then
echo "failed: failed to install Apache APISIX by rpm"
exit 1
fi

- name: stop and uninstall APISIX(-remote) 2.10.1
- name: stop and uninstall APISIX(-remote) 2.13.1
run: |
docker exec centos8Instance bash -c "pkill -f nginx"
docker exec centos8Instance bash -c "yum -y erase apisix-remote-2.10.1"
docker exec centos8Instance bash -c "yum -y erase apisix-remote-2.13.1"

- name: install APISIX(-local) by rpm in container
run: |
Expand Down
3 changes: 3 additions & 0 deletions build-apisix-base.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ if ([ $# -gt 0 ] && [ "$1" == "latest" ]) || [ "$version" == "latest" ]; then
lua_var_nginx_module_ver=""
debug_args="--with-debug"
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty-debug"}
add_shared_shdict_module="--add-module=../apisix-nginx-module/src/meta"
else
ngx_multi_upstream_module_ver="-b 1.0.1"
mod_dubbo_ver="-b 1.0.2"
Expand All @@ -20,6 +21,7 @@ else
lua_var_nginx_module_ver="-b v0.5.2"
debug_args=${debug_args:-}
OR_PREFIX=${OR_PREFIX:="/usr/local/openresty"}
add_shared_shdict_module=${add_shared_shdict_module:-}
fi

prev_workdir="$PWD"
Expand Down Expand Up @@ -92,6 +94,7 @@ cd openresty-${or_ver} || exit 1
--add-module=../ngx_multi_upstream_module \
--add-module=../apisix-nginx-module \
--add-module=../apisix-nginx-module/src/stream \
$add_shared_shdict_module \
--add-module=../wasm-nginx-module \
--add-module=../lua-var-nginx-module \
--with-poll_module \
Expand Down