From 5c2d8f4e3f9e54bf1ee6453efbd24dec5a8e9672 Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Mon, 1 Apr 2024 15:16:07 +0545 Subject: [PATCH] chore: release APISIX 3.9.0 (#549) --- .../workflows/apisix-docker-example-test-standalone.yaml | 2 +- .github/workflows/apisix-docker-example-test.yaml | 2 +- .github/workflows/apisix_push_docker_hub.yaml | 2 +- Makefile | 4 ++-- all-in-one/apisix-dashboard/Dockerfile | 7 +------ debian/Dockerfile | 2 +- docs/en/latest/build.md | 2 +- example/docker-compose-arm64.yml | 2 +- example/docker-compose-standalone.yml | 2 +- example/docker-compose.yml | 2 +- redhat/Dockerfile | 2 +- 11 files changed, 12 insertions(+), 17 deletions(-) diff --git a/.github/workflows/apisix-docker-example-test-standalone.yaml b/.github/workflows/apisix-docker-example-test-standalone.yaml index 229f3c39..140c1021 100644 --- a/.github/workflows/apisix-docker-example-test-standalone.yaml +++ b/.github/workflows/apisix-docker-example-test-standalone.yaml @@ -14,7 +14,7 @@ on: - 'release/apisix-2.15.**' env: - APISIX_VERSION: "3.8.0" + APISIX_VERSION: "3.9.0" jobs: prepare: diff --git a/.github/workflows/apisix-docker-example-test.yaml b/.github/workflows/apisix-docker-example-test.yaml index c508a45d..3f114730 100644 --- a/.github/workflows/apisix-docker-example-test.yaml +++ b/.github/workflows/apisix-docker-example-test.yaml @@ -14,7 +14,7 @@ on: - 'release/apisix-2.15.**' env: - APISIX_VERSION: "3.8.0" + APISIX_VERSION: "3.9.0" jobs: prepare: diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml index 799af836..f0f05a33 100644 --- a/.github/workflows/apisix_push_docker_hub.yaml +++ b/.github/workflows/apisix_push_docker_hub.yaml @@ -13,7 +13,7 @@ jobs: - debian - redhat env: - APISIX_DOCKER_TAG: 3.8.0-${{ matrix.platform }} + APISIX_DOCKER_TAG: 3.9.0-${{ matrix.platform }} steps: - name: Check out the repo diff --git a/Makefile b/Makefile index 8bb88c1c..0fd06a73 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ SHELL := bash # APISIX ARGS -APISIX_VERSION ?= 3.8.0 -MAX_APISIX_VERSION ?= 3.8.0 +APISIX_VERSION ?= 3.9.0 +MAX_APISIX_VERSION ?= 3.9.0 IMAGE_NAME = apache/apisix IMAGE_TAR_NAME = apache_apisix APISIX_REPO = https://github.com/apache/apisix diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile index 7daa82a3..bf906d04 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -21,7 +21,7 @@ ARG APISIX_VERSION=master ARG APISIX_DASHBOARD_VERSION=master # Build Apache APISIX -FROM openresty/openresty:1.21.4.2-alpine-fat AS production-stage +FROM openresty/openresty:1.25.3.1-2-alpine-fat AS production-stage ARG APISIX_VERSION ARG ENABLE_PROXY @@ -42,11 +42,6 @@ RUN set -x \ && luarocks config variables.OPENSSL_LIBDIR /usr/local/openresty/openssl/lib \ && luarocks config variables.OPENSSL_INCDIR /usr/local/openresty/openssl/include \ && git config --global url.https://github.com/.insteadOf git://github.com/ \ - && curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sudo sh -s -- -y \ - && source "$HOME/.cargo/env" \ - && export CARGO_REGISTRIES_CRATES_IO_PROTOCOL=sparse \ - # next line is for rust cdylib compile on musl - && export RUSTFLAGS="-C target-feature=-crt-static" \ && luarocks install https://raw.githubusercontent.com/apache/apisix/master/apisix-master-0.rockspec --tree=/usr/local/apisix/deps PCRE_DIR=/usr/local/openresty/pcre \ && cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \ && (if [ "$APISIX_VERSION" = "master" ] || [ "$APISIX_VERSION" \> "2.2" ]; then echo 'use shell ';else bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path'; sed -i "1s@.*@$bin@" /usr/bin/apisix ; fi;) \ diff --git a/debian/Dockerfile b/debian/Dockerfile index 818e28a1..c380951e 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -17,7 +17,7 @@ FROM debian:bullseye-slim -ARG APISIX_VERSION=3.8.0 +ARG APISIX_VERSION=3.9.0 RUN set -ex; \ arch=$(dpkg --print-architecture); \ diff --git a/docs/en/latest/build.md b/docs/en/latest/build.md index a18d7fd7..fe0fdf77 100644 --- a/docs/en/latest/build.md +++ b/docs/en/latest/build.md @@ -43,7 +43,7 @@ Find an APISIX [release version](https://github.com/apache/apisix/releases) to b Build a Docker image from the release: ```shell -APISIX_VERSION=3.8.0 # specify release version +APISIX_VERSION=3.9.0 # specify release version DISTRO=debian # debian, redhat make build-on-$DISTRO ``` diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml index b01a50e5..2a090912 100644 --- a/example/docker-compose-arm64.yml +++ b/example/docker-compose-arm64.yml @@ -19,7 +19,7 @@ version: "3" services: apisix: - image: apache/apisix:3.8.0-debian + image: apache/apisix:3.9.0-debian restart: always volumes: - ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro diff --git a/example/docker-compose-standalone.yml b/example/docker-compose-standalone.yml index d5d67170..039873f9 100644 --- a/example/docker-compose-standalone.yml +++ b/example/docker-compose-standalone.yml @@ -19,7 +19,7 @@ version: "3" services: apisix: - image: apache/apisix:${APISIX_IMAGE_TAG:-3.8.0-debian} + image: apache/apisix:${APISIX_IMAGE_TAG:-3.9.0-debian} restart: always volumes: - ./apisix_conf/apisix-standalone.yaml:/usr/local/apisix/conf/apisix.yaml:ro diff --git a/example/docker-compose.yml b/example/docker-compose.yml index 603134ae..69f65c5a 100644 --- a/example/docker-compose.yml +++ b/example/docker-compose.yml @@ -19,7 +19,7 @@ version: "3" services: apisix: - image: apache/apisix:${APISIX_IMAGE_TAG:-3.8.0-debian} + image: apache/apisix:${APISIX_IMAGE_TAG:-3.9.0-debian} restart: always volumes: - ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro diff --git a/redhat/Dockerfile b/redhat/Dockerfile index e4a5bace..ca65c2e1 100644 --- a/redhat/Dockerfile +++ b/redhat/Dockerfile @@ -17,7 +17,7 @@ FROM registry.access.redhat.com/ubi8/ubi:8.6 -ARG APISIX_VERSION=3.8.0 +ARG APISIX_VERSION=3.9.0 LABEL apisix_version="${APISIX_VERSION}" COPY ./yum.repos.d/apache-apisix.repo /etc/yum.repos.d/apache-apisix.repo COPY ./yum.repos.d/openresty.repo /etc/yum.repos.d/openresty.repo