From 100358f81c3e44995155a88415f03d34e6543243 Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Wed, 17 Jun 2026 11:35:42 +0800 Subject: [PATCH 1/6] chore: release 3.17.0 --- .github/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 | 2 +- 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 +- ubuntu/Dockerfile | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/apisix-docker-example-test-standalone.yaml b/.github/workflows/apisix-docker-example-test-standalone.yaml index a9372ae7..44f23f99 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.16.0" + APISIX_VERSION: "3.17.0" jobs: prepare: diff --git a/.github/workflows/apisix-docker-example-test.yaml b/.github/workflows/apisix-docker-example-test.yaml index 49f6d4bd..b5d5e356 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.16.0" + APISIX_VERSION: "3.17.0" jobs: prepare: diff --git a/.github/workflows/apisix_push_docker_hub.yaml b/.github/workflows/apisix_push_docker_hub.yaml index 47b41348..8b087dff 100644 --- a/.github/workflows/apisix_push_docker_hub.yaml +++ b/.github/workflows/apisix_push_docker_hub.yaml @@ -19,7 +19,7 @@ jobs: - debian - redhat env: - APISIX_DOCKER_TAG: 3.16.0-${{ matrix.platform }} + APISIX_DOCKER_TAG: 3.17.0-${{ matrix.platform }} steps: - name: Check out the repo diff --git a/Makefile b/Makefile index 5c299fd6..188aeba5 100644 --- a/Makefile +++ b/Makefile @@ -21,8 +21,8 @@ SHELL := bash # APISIX ARGS -APISIX_VERSION ?= 3.16.0 -MAX_APISIX_VERSION ?= 3.16.0 +APISIX_VERSION ?= 3.17.0 +MAX_APISIX_VERSION ?= 3.17.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 dbb05f0b..f518f6b1 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -17,7 +17,7 @@ ARG ENABLE_PROXY=false ARG ETCD_VERSION=v3.4.14 -ARG APISIX_VERSION=3.16.0 +ARG APISIX_VERSION=3.17.0 ARG APISIX_DASHBOARD_VERSION=master # Build Apache APISIX (using official package with apisix-nginx-module) diff --git a/debian/Dockerfile b/debian/Dockerfile index a90367ec..2b15de79 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -17,7 +17,7 @@ FROM debian:bookworm-slim -ARG APISIX_VERSION=3.16.0 +ARG APISIX_VERSION=3.17.0 RUN set -ex; \ arch=$(dpkg --print-architecture); \ diff --git a/docs/en/latest/build.md b/docs/en/latest/build.md index cbff295a..24592f59 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.16.0 # specify release version +APISIX_VERSION=3.17.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 dca8c493..488c89de 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.16.0-debian + image: apache/apisix:3.17.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 8853d5c1..3be1c303 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.16.0-debian} + image: apache/apisix:${APISIX_IMAGE_TAG:-3.17.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 a1d0614e..5834dd76 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.16.0-debian} + image: apache/apisix:${APISIX_IMAGE_TAG:-3.17.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 8469bd82..d8a7acb2 100644 --- a/redhat/Dockerfile +++ b/redhat/Dockerfile @@ -17,7 +17,7 @@ FROM registry.access.redhat.com/ubi9/ubi:9.6 -ARG APISIX_VERSION=3.16.0 +ARG APISIX_VERSION=3.17.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 diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 6b85a632..3834a8fe 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -17,7 +17,7 @@ FROM ubuntu:24.04 -ARG APISIX_VERSION=3.16.0 +ARG APISIX_VERSION=3.17.0 RUN set -ex; \ arch=$(dpkg --print-architecture); \ From 8bb27b3f9f20126dafa6652e804a91645570dcda Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Thu, 18 Jun 2026 10:20:48 +0800 Subject: [PATCH 2/6] fix: tolerate missing etcdctl binary in apisix 3.17.0 package --- all-in-one/apisix/Dockerfile | 2 +- debian/Dockerfile | 2 +- redhat/Dockerfile | 2 +- ubuntu/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile index 5de9d0d7..62e21568 100644 --- a/all-in-one/apisix/Dockerfile +++ b/all-in-one/apisix/Dockerfile @@ -32,7 +32,7 @@ USER root RUN wget https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \ && tar -zxvf etcd-${ETCD_VERSION}-linux-amd64.tar.gz \ && mv etcd-${ETCD_VERSION}-linux-amd64/* /usr/bin/ \ - && rm /usr/local/openresty/bin/etcdctl + && rm -f /usr/local/openresty/bin/etcdctl WORKDIR /usr/local/apisix diff --git a/debian/Dockerfile b/debian/Dockerfile index 2b15de79..8bb2b1be 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex; \ apt update \ && apt install -y apisix=${APISIX_VERSION}-0 \ && apt-get purge -y --auto-remove \ - && rm /usr/local/openresty/bin/etcdctl \ + && rm -f /usr/local/openresty/bin/etcdctl \ && openresty -V \ && apisix version diff --git a/redhat/Dockerfile b/redhat/Dockerfile index d8a7acb2..0af3bd82 100644 --- a/redhat/Dockerfile +++ b/redhat/Dockerfile @@ -43,7 +43,7 @@ RUN groupadd --system --gid 636 apisix \ # forward request and error logs to docker log collector RUN ln -sf /dev/stdout /usr/local/apisix/logs/access.log \ && ln -sf /dev/stderr /usr/local/apisix/logs/error.log \ - && rm /usr/local/openresty/bin/etcdctl + && rm -f /usr/local/openresty/bin/etcdctl USER apisix diff --git a/ubuntu/Dockerfile b/ubuntu/Dockerfile index 3834a8fe..af3854f5 100644 --- a/ubuntu/Dockerfile +++ b/ubuntu/Dockerfile @@ -37,7 +37,7 @@ RUN set -ex; \ apt update \ && apt install -y apisix=${APISIX_VERSION}-0 \ && apt-get purge -y --auto-remove \ - && rm /usr/local/openresty/bin/etcdctl \ + && rm -f /usr/local/openresty/bin/etcdctl \ && openresty -V \ && apisix version From 97ff9dabe9d8cfbd4a6dd36e41249cbb08afb7b9 Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Thu, 18 Jun 2026 10:36:04 +0800 Subject: [PATCH 3/6] fix: build dashboard all-in-one image on bookworm for apisix 3.17.0 --- all-in-one/apisix-dashboard/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile index f518f6b1..7d258554 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -21,7 +21,7 @@ ARG APISIX_VERSION=3.17.0 ARG APISIX_DASHBOARD_VERSION=master # Build Apache APISIX (using official package with apisix-nginx-module) -FROM debian:bullseye-slim AS production-stage +FROM debian:bookworm-slim AS production-stage ARG APISIX_VERSION LABEL apisix_version="${APISIX_VERSION}" @@ -30,7 +30,7 @@ RUN set -ex; \ arch=$(dpkg --print-architecture); \ apt update; \ apt-get -y install --no-install-recommends wget gnupg ca-certificates curl; \ - codename=`grep -Po 'VERSION="[0-9]+ \(\K[^)]+' /etc/os-release`; \ + codename="debian12"; \ case "${arch}" in \ amd64) \ wget -O - https://repos.apiseven.com/pubkey.gpg | apt-key add - \ From b67e865c251f46a8d726b6b8cebe84015f968df3 Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Thu, 18 Jun 2026 10:53:16 +0800 Subject: [PATCH 4/6] fix: align dashboard all-in-one runtime stage to bookworm --- all-in-one/apisix-dashboard/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile index 7d258554..6265b54f 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -101,7 +101,7 @@ RUN if [ "$ENABLE_PROXY" = "true" ] ; then yarn config set registry https://regi && yarn build # Finally combine all the resources into one image -FROM debian:bullseye-slim AS last-stage +FROM debian:bookworm-slim AS last-stage # add runtime for Apache APISIX RUN apt update \ From af09d61f913c92a39acb2466978ef1869719999c Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Thu, 18 Jun 2026 11:09:43 +0800 Subject: [PATCH 5/6] fix: add libpcre3 runtime dep to dashboard all-in-one image --- all-in-one/apisix-dashboard/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/all-in-one/apisix-dashboard/Dockerfile b/all-in-one/apisix-dashboard/Dockerfile index 6265b54f..46414c72 100644 --- a/all-in-one/apisix-dashboard/Dockerfile +++ b/all-in-one/apisix-dashboard/Dockerfile @@ -110,6 +110,7 @@ RUN apt update \ curl \ ca-certificates \ libyaml-0-2 \ + libpcre3 \ lua5.1 \ && rm -rf /var/lib/apt/lists/* From 871f5c0c3983836730f6025706ae337ba70b62ab Mon Sep 17 00:00:00 2001 From: Abhishek Choudhary Date: Thu, 18 Jun 2026 11:52:03 +0800 Subject: [PATCH 6/6] fix: install cmake and g++ for rapidjson dep in local source build --- debian-dev/Dockerfile.local | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian-dev/Dockerfile.local b/debian-dev/Dockerfile.local index c9209463..041a62d2 100644 --- a/debian-dev/Dockerfile.local +++ b/debian-dev/Dockerfile.local @@ -33,6 +33,8 @@ RUN set -x \ && apt-get -y update --fix-missing \ && apt-get install -y \ make \ + cmake \ + g++ \ git \ sudo \ libyaml-dev \