[apisix-docker] branch master updated: fix: docker desktop startup failure (#501)

[monkeydluffy]

This is an automated email from the ASF dual-hosted git repository.

monkeydluffy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new b972460  fix: docker desktop startup failure (#501)
b972460 is described below

commit b9724607f4658e4a8db2b0db312a7184afd3b878
Author: LianChongsen <75706...@qq.com>
AuthorDate: Sat Oct 7 13:38:21 2023 +0800

    fix: docker desktop startup failure (#501)
---
 centos/docker-entrypoint.sh     | 5 +++++
 debian-dev/docker-entrypoint.sh | 5 +++++
 debian/docker-entrypoint.sh     | 5 +++++
 redhat/docker-entrypoint.sh     | 5 +++++
 4 files changed, 20 insertions(+)

diff --git a/centos/docker-entrypoint.sh b/centos/docker-entrypoint.sh
index 93565ef..a8a34a9 100755
--- a/centos/docker-entrypoint.sh
+++ b/centos/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/debian-dev/docker-entrypoint.sh b/debian-dev/docker-entrypoint.sh
index b9d54c4..e7fdc01 100755
--- 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/docker-entrypoint.sh b/debian/docker-entrypoint.sh
index 93565ef..a8a34a9 100755
--- 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/redhat/docker-entrypoint.sh b/redhat/docker-entrypoint.sh
index 93565ef..a8a34a9 100755
--- 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