fix: use sed replace yq (#508)

apache · Sep 28, 2023 · e0ac41c · e0ac41c
1 parent bd073cf
commit e0ac41c
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 21 deletions.
diff --git a/.github/workflows/apisix-docker-example-test-standalone.yaml b/.github/workflows/apisix-docker-example-test-standalone.yaml
@@ -60,7 +60,7 @@ jobs:
 
       - name: Test APISIX
         run: |
-          sleep 50 #startup time maybe a little longer as the yq binary is downloaded for use at runtime
+          sleep 30
 
           result_code=`curl -I -m 10 -o /dev/null -s -w %{http_code} http://127.0.0.1:9080/get`
           if [[ $result_code -ne 200 ]];then

diff --git a/centos/docker-entrypoint.sh b/centos/docker-entrypoint.sh
@@ -31,11 +31,10 @@ deployment:
     config_provider: yaml
 _EOC_
       else
-          wget -qO /usr/local/apisix/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
-	        && chmod a+x /usr/local/apisix/yq
-          /usr/local/apisix/yq -i '.deployment.role = "data_plane"' ${PREFIX}/conf/config.yaml
-          /usr/local/apisix/yq -i '.deployment.role_data_plane.config_provider = "yaml"' ${PREFIX}/conf/config.yaml 
-          rm /usr/local/apisix/yq
+          # updating config.yaml for standalone mode
+          sed -i 's/role: traditional/role: data_plane/' ${PREFIX}/conf/config.yaml
+          sed -i 's/role_traditional:/role_data_plane:/' ${PREFIX}/conf/config.yaml
+          sed -i 's/config_provider: etcd/config_provider: yaml/' ${PREFIX}/conf/config.yaml
       fi
 
         if [ ! -f "${PREFIX}/conf/apisix.yaml" ]; then

diff --git a/debian-dev/docker-entrypoint.sh b/debian-dev/docker-entrypoint.sh
@@ -31,11 +31,10 @@ deployment:
     config_provider: yaml
 _EOC_
       else
-          wget -qO /usr/local/apisix/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
-	        && chmod a+x /usr/local/apisix/yq
-          /usr/local/apisix/yq -i '.deployment.role = "data_plane"' ${PREFIX}/conf/config.yaml
-          /usr/local/apisix/yq -i '.deployment.role_data_plane.config_provider = "yaml"' ${PREFIX}/conf/config.yaml 
-          rm /usr/local/apisix/yq      
+          # updating config.yaml for standalone mode
+          sed -i 's/role: traditional/role: data_plane/' ${PREFIX}/conf/config.yaml
+          sed -i 's/role_traditional:/role_data_plane:/' ${PREFIX}/conf/config.yaml
+          sed -i 's/config_provider: etcd/config_provider: yaml/' ${PREFIX}/conf/config.yaml
       fi
 
         if [ ! -f "${PREFIX}/conf/apisix.yaml" ]; then

diff --git a/debian/docker-entrypoint.sh b/debian/docker-entrypoint.sh
@@ -31,11 +31,10 @@ deployment:
     config_provider: yaml
 _EOC_
       else
-          wget -qO /usr/local/apisix/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
-	        && chmod a+x /usr/local/apisix/yq
-          /usr/local/apisix/yq -i '.deployment.role = "data_plane"' ${PREFIX}/conf/config.yaml
-          /usr/local/apisix/yq -i '.deployment.role_data_plane.config_provider = "yaml"' ${PREFIX}/conf/config.yaml 
-          rm /usr/local/apisix/yq
+          # updating config.yaml for standalone mode
+          sed -i 's/role: traditional/role: data_plane/' ${PREFIX}/conf/config.yaml
+          sed -i 's/role_traditional:/role_data_plane:/' ${PREFIX}/conf/config.yaml
+          sed -i 's/config_provider: etcd/config_provider: yaml/' ${PREFIX}/conf/config.yaml
       fi
 
         if [ ! -f "${PREFIX}/conf/apisix.yaml" ]; then

diff --git a/redhat/docker-entrypoint.sh b/redhat/docker-entrypoint.sh
@@ -31,11 +31,10 @@ deployment:
     config_provider: yaml
 _EOC_
       else
-          wget -qO /usr/local/apisix/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 \
-	        && chmod a+x /usr/local/apisix/yq
-          /usr/local/apisix/yq -i '.deployment.role = "data_plane"' ${PREFIX}/conf/config.yaml
-          /usr/local/apisix/yq -i '.deployment.role_data_plane.config_provider = "yaml"' ${PREFIX}/conf/config.yaml 
-          rm /usr/local/apisix/yq
+          # updating config.yaml for standalone mode
+          sed -i 's/role: traditional/role: data_plane/' ${PREFIX}/conf/config.yaml
+          sed -i 's/role_traditional:/role_data_plane:/' ${PREFIX}/conf/config.yaml
+          sed -i 's/config_provider: etcd/config_provider: yaml/' ${PREFIX}/conf/config.yaml
       fi
 
         if [ ! -f "${PREFIX}/conf/apisix.yaml" ]; then