Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- 'release/apisix-2.15.**'

env:
APISIX_VERSION: "3.16.0"
APISIX_VERSION: "3.17.0"

jobs:
prepare:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apisix-docker-example-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ on:
- 'release/apisix-2.15.**'

env:
APISIX_VERSION: "3.16.0"
APISIX_VERSION: "3.17.0"

jobs:
prepare:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/apisix_push_docker_hub.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 5 additions & 4 deletions all-in-one/apisix-dashboard/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

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)
FROM debian:bullseye-slim AS production-stage
FROM debian:bookworm-slim AS production-stage

ARG APISIX_VERSION
LABEL apisix_version="${APISIX_VERSION}"
Expand All @@ -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 - \
Expand Down Expand Up @@ -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 \
Expand All @@ -110,6 +110,7 @@ RUN apt update \
curl \
ca-certificates \
libyaml-0-2 \
libpcre3 \
lua5.1 \
&& rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion all-in-one/apisix/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions debian-dev/Dockerfile.local
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ RUN set -x \
&& apt-get -y update --fix-missing \
&& apt-get install -y \
make \
cmake \
g++ \
git \
sudo \
libyaml-dev \
Expand Down
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/build.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose-arm64.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose-standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions redhat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down
4 changes: 2 additions & 2 deletions ubuntu/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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); \
Expand All @@ -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

Expand Down
Loading