Skip to content
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

chore(openresty): upgrade openresty #422

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

chore(openresty): upgrade openresty #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f12216
chore(openresty): upgrade openresty
hutchic May 9, 2024
c30b35e
chore(patches): use the patches from the Kong repository
hutchic May 9, 2024
1ccdc88
chore(luarocks): upgrade luarocks
hutchic May 9, 2024
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
4 changes: 2 additions & 2 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
OPENRESTY_VERSION=1.21.4.1
LUAROCKS_VERSION=3.9.2
OPENRESTY_VERSION=1.21.4.2
LUAROCKS_VERSION=3.10.0
PCRE_VERSION=8.45
ATC_ROUTER_VERSION=1.3.30
5 changes: 4 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ clean:
-rm -rf package
-docker rmi $(DOCKER_NAME)

docker:
clean/submodules:
-git submodule foreach --recursive git reset --hard
-git submodule update --init --recursive
-git submodule status

docker:
docker buildx build \
--build-arg DOCKER_REGISTRY=$(DOCKER_REGISTRY) \
--build-arg DOCKER_IMAGE_NAME=$(DOCKER_IMAGE_NAME) \
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function main() {
echo '--- components downloaded ---'
echo '--- patching openresty ---'
pushd openresty-${OPENRESTY_VERSION}
for patch_file in $(ls /tmp/patches/*.patch); do
for patch_file in $(ls /tmp/kong/build/openresty/patches/*.patch); do
patch -p1 < $patch_file
done

Expand Down
2 changes: 1 addition & 1 deletion kong
Open in desktop
Submodule kong updated 217 files
1 change: 0 additions & 1 deletion patches
View file
Open in desktop

This file was deleted.

Loading