fix: docker desktop startup failure (#501)

apache · Oct 7, 2023 · b972460 · b972460
1 parent 68d7171
commit b972460
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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