Merge branch 'master' of github.com:apache/apisix-docker into rm-cent

apache · Oct 7, 2023 · 4201938 · 4201938
2 parents 4aa4c04 + 6ab8bec
commit 4201938
Show file tree

Hide file tree

Showing 13 changed files with 27 additions and 12 deletions.
diff --git 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.5.0"
+  APISIX_VERSION: "3.6.0"
 
 jobs:
   prepare:

diff --git 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.5.0"
+  APISIX_VERSION: "3.6.0"
 
 jobs:
   prepare:

diff --git 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.5.0-${{ matrix.platform }}
+      APISIX_DOCKER_TAG: 3.6.0-${{ matrix.platform }}
 
     steps:
       - name: Check out the repo

diff --git a/Makefile b/Makefile
@@ -21,8 +21,8 @@ SHELL := bash
 
 
 # APISIX ARGS
-APISIX_VERSION ?= 3.5.0
-MAX_APISIX_VERSION ?= 3.5.0
+APISIX_VERSION ?= 3.6.0
+MAX_APISIX_VERSION ?= 3.6.0
 IMAGE_NAME = apache/apisix
 IMAGE_TAR_NAME = apache_apisix
 

diff --git a/debian-dev/docker-entrypoint.sh b/debian-dev/docker-entrypoint.sh
@@ -49,6 +49,11 @@ _EOC_
         /usr/bin/apisix init
         /usr/bin/apisix init_etcd
     fi
+
+    # For versions below 3.5.0 whose conf_server has not been removed.
+    if [ -e "/usr/local/apisix/conf/config_listen.sock" ]; then
+        rm -f "/usr/local/apisix/conf/config_listen.sock"
+    fi
 
     exec /usr/local/openresty-debug/bin/openresty -p /usr/local/apisix -g 'daemon off;'
 fi

diff --git a/debian/Dockerfile b/debian/Dockerfile
@@ -17,7 +17,7 @@
 
 FROM debian:bullseye-slim
 
-ARG APISIX_VERSION=3.5.0
+ARG APISIX_VERSION=3.6.0
 
 RUN set -ex; \
     arch=$(dpkg --print-architecture); \

diff --git a/debian/docker-entrypoint.sh b/debian/docker-entrypoint.sh
@@ -49,6 +49,11 @@ _EOC_
         /usr/bin/apisix init
         /usr/bin/apisix init_etcd
     fi
+
+    # For versions below 3.5.0 whose conf_server has not been removed.
+    if [ -e "/usr/local/apisix/conf/config_listen.sock" ]; then
+        rm -f "/usr/local/apisix/conf/config_listen.sock"
+    fi
 
     exec /usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'
 fi

diff --git 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.5.0    # specify release version
+APISIX_VERSION=3.6.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
@@ -29,7 +29,7 @@ services:
       apisix:
 
   apisix:
-    image: apache/apisix:3.5.0-debian
+    image: apache/apisix:3.6.0-debian
     restart: always
     volumes:
       - ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro
@@ -54,7 +54,7 @@ services:
       ETCD_UNSUPPORTED_ARCH: "arm64"
       ETCD_ENABLE_V2: "true"
       ALLOW_NONE_AUTHENTICATION: "yes"
-      ETCD_ADVERTISE_CLIENT_URLS: "http://0.0.0.0:2379"
+      ETCD_ADVERTISE_CLIENT_URLS: "http://etcd:2379"
       ETCD_LISTEN_CLIENT_URLS: "http://0.0.0.0:2379"
       ETCD_DATA_DIR: "/etcd-data"
     ports:

diff --git 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.5.0-debian}
+    image: apache/apisix:${APISIX_IMAGE_TAG:-3.6.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
@@ -29,7 +29,7 @@ services:
       apisix:
 
   apisix:
-    image: apache/apisix:${APISIX_IMAGE_TAG:-3.5.0-debian}
+    image: apache/apisix:${APISIX_IMAGE_TAG:-3.6.0-debian}
     restart: always
     volumes:
       - ./apisix_conf/config.yaml:/usr/local/apisix/conf/config.yaml:ro

diff --git a/redhat/Dockerfile b/redhat/Dockerfile
@@ -17,7 +17,7 @@
 
 FROM registry.access.redhat.com/ubi8/ubi:8.6
 
-ARG APISIX_VERSION=3.5.0
+ARG APISIX_VERSION=3.6.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/redhat/docker-entrypoint.sh b/redhat/docker-entrypoint.sh
@@ -49,6 +49,11 @@ _EOC_
         /usr/bin/apisix init
         /usr/bin/apisix init_etcd
     fi
+
+    # For versions below 3.5.0 whose conf_server has not been removed.
+    if [ -e "/usr/local/apisix/conf/config_listen.sock" ]; then
+        rm -f "/usr/local/apisix/conf/config_listen.sock"
+    fi
 
     exec /usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,7 +13,7 @@ jobs: @@
               - debian
               - redhat
         env:
-          APISIX_DOCKER_TAG: 3.5.0-${{ matrix.platform }}
+          APISIX_DOCKER_TAG: 3.6.0-${{ matrix.platform }}
         steps:
           - name: Check out the repo
@@ Expand Down @@