This is an automated email from the ASF dual-hosted git repository.
bzp2010 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 564247d7c fix(ci): use docker compose plugin instead of docker-compose
(#11469)
564247d7c is described below
commit 564247d7c5481d3af9b6df7caa8bceca7b5b0dc9
Author: Shreemaan Abhishek <[email protected]>
AuthorDate: Sun Aug 4 18:18:05 2024 +0545
fix(ci): use docker compose plugin instead of docker-compose (#11469)
---
Makefile | 2 +-
ci/init-last-test-service.sh | 10 +++++-----
ci/init-plugin-test-service.sh | 6 +++---
t/cli/test_etcd_healthcheck.sh | 4 ++--
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index c4cbc6842..21a238963 100644
--- a/Makefile
+++ b/Makefile
@@ -37,7 +37,7 @@ ENV_TAR ?= tar
ENV_INSTALL ?= install
ENV_RM ?= rm -vf
ENV_DOCKER ?= docker
-ENV_DOCKER_COMPOSE ?= docker-compose --project-directory $(CURDIR) -p
$(project_name) -f $(project_compose_ci)
+ENV_DOCKER_COMPOSE ?= docker compose --project-directory $(CURDIR) -p
$(project_name) -f $(project_compose_ci)
ENV_NGINX ?= $(ENV_NGINX_EXEC) -p $(CURDIR) -c
$(CURDIR)/conf/nginx.conf
ENV_NGINX_EXEC := $(shell command -v openresty 2>/dev/null || command
-v nginx 2>/dev/null)
ENV_OPENSSL_PREFIX ?= /usr/local/openresty/openssl3
diff --git a/ci/init-last-test-service.sh b/ci/init-last-test-service.sh
index 5c3feeec7..694349056 100755
--- a/ci/init-last-test-service.sh
+++ b/ci/init-last-test-service.sh
@@ -22,14 +22,14 @@ before() {
}
after() {
- docker exec -i apache-apisix_kafka-server1_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic test2
- docker exec -i apache-apisix_kafka-server1_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 3 --topic test3
- docker exec -i apache-apisix_kafka-server2_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
- docker exec -i apache-apisix_kafka-server1_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic
test-consumer
+ docker exec -i apache-apisix-kafka-server1-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic test2
+ docker exec -i apache-apisix-kafka-server1-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 3 --topic test3
+ docker exec -i apache-apisix-kafka-server2-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
+ docker exec -i apache-apisix-kafka-server1-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic
test-consumer
# create messages for test-consumer
for i in `seq 30`
do
- docker exec -i apache-apisix_kafka-server1_1 bash -c "echo "testmsg$i"
| /opt/bitnami/kafka/bin/kafka-console-producer.sh --bootstrap-server
127.0.0.1:9092 --topic test-consumer"
+ docker exec -i apache-apisix-kafka-server1-1 bash -c "echo "testmsg$i"
| /opt/bitnami/kafka/bin/kafka-console-producer.sh --bootstrap-server
127.0.0.1:9092 --topic test-consumer"
echo "Produces messages to the test-consumer topic, msg: testmsg$i"
done
echo "Kafka service initialization completed"
diff --git a/ci/init-plugin-test-service.sh b/ci/init-plugin-test-service.sh
index aa0ccf190..400465bf1 100755
--- a/ci/init-plugin-test-service.sh
+++ b/ci/init-plugin-test-service.sh
@@ -17,9 +17,9 @@
#
after() {
- docker exec -i apache-apisix_kafka-server1_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic test2
- docker exec -i apache-apisix_kafka-server1_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 3 --topic test3
- docker exec -i apache-apisix_kafka-server2_1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
+ docker exec -i apache-apisix-kafka-server1-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 1 --topic test2
+ docker exec -i apache-apisix-kafka-server1-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server1:2181 --replication-factor 1 --partitions 3 --topic test3
+ docker exec -i apache-apisix-kafka-server2-1
/opt/bitnami/kafka/bin/kafka-topics.sh --create --zookeeper
zookeeper-server2:2181 --replication-factor 1 --partitions 1 --topic test4
# prepare openwhisk env
docker pull openwhisk/action-nodejs-v14:1.20.0
diff --git a/t/cli/test_etcd_healthcheck.sh b/t/cli/test_etcd_healthcheck.sh
index e756653c1..41efb16b0 100755
--- a/t/cli/test_etcd_healthcheck.sh
+++ b/t/cli/test_etcd_healthcheck.sh
@@ -43,7 +43,7 @@ deployment:
timeout: 2
' > conf/config.yaml
-docker-compose -f ./t/cli/docker-compose-etcd-cluster.yaml up -d
+docker compose -f ./t/cli/docker-compose-etcd-cluster.yaml up -d
# case 1: Check apisix not got effected when one etcd node disconnected
make init && make run
@@ -142,4 +142,4 @@ else
fi
# stop etcd docker container
-docker-compose -f ./t/cli/docker-compose-etcd-cluster.yaml down
+docker compose -f ./t/cli/docker-compose-etcd-cluster.yaml down
