fix: sed not suitable for docker if config.yaml is volume mounted (#534)

apache · Jan 12, 2024 · a01780a · a01780a
1 parent 915c187
commit a01780a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/debian-dev/docker-entrypoint.sh b/debian-dev/docker-entrypoint.sh
@@ -32,9 +32,10 @@ deployment:
 _EOC_
       else
           # 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
+          echo "$(sed 's/role: traditional/role: data_plane/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/role_traditional:/role_data_plane:/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/config_provider: etcd/config_provider: yaml/g' ${PREFIX}/conf/config.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
@@ -32,9 +32,9 @@ deployment:
 _EOC_
       else
           # 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
+          echo "$(sed 's/role: traditional/role: data_plane/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/role_traditional:/role_data_plane:/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/config_provider: etcd/config_provider: yaml/g' ${PREFIX}/conf/config.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
@@ -32,9 +32,9 @@ deployment:
 _EOC_
       else
           # 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
+          echo "$(sed 's/role: traditional/role: data_plane/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/role_traditional:/role_data_plane:/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
+          echo "$(sed 's/config_provider: etcd/config_provider: yaml/g' ${PREFIX}/conf/config.yaml)" > ${PREFIX}/conf/config.yaml
       fi
 
         if [ ! -f "${PREFIX}/conf/apisix.yaml" ]; then