Merge branch 'apache:master' into issue-417

apache · Feb 1, 2024 · 6faec21 · 6faec21
2 parents c7f45f9 + da7252d
commit 6faec21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -149,7 +149,7 @@ push-multiarch-on-latest:
 	@if [ "$(shell echo "$(APISIX_VERSION) $(MAX_APISIX_VERSION)" | tr " " "\n" | sort -rV | head -n 1)" == "$(APISIX_VERSION)" ]; then \
 		$(ENV_DOCKER) buildx build --network=host --push \
 			-t $(IMAGE_NAME):latest \
-			--platform linux/amd64,linux/arm64 \
+			--platform linux/amd64 \
 			-f ./debian/Dockerfile debian; \
 	fi
 	@$(call func_echo_success_status, "$@ -> [ Done ]")

diff --git a/debian/docker-entrypoint.sh b/debian/docker-entrypoint.sh
@@ -54,6 +54,10 @@ _EOC_
     if [ -e "/usr/local/apisix/conf/config_listen.sock" ]; then
         rm -f "/usr/local/apisix/conf/config_listen.sock"
     fi
+
+    if [ -e "/usr/local/apisix/logs/worker_events.sock" ]; then
+        rm -f "/usr/local/apisix/logs/worker_events.sock"
+    fi
 
     exec /usr/local/openresty/bin/openresty -p /usr/local/apisix -g 'daemon off;'
 fi