Merge branch 'master' of github.com:apache/apisix-docker into rm-cent

.github/workflows/apisix-docker-example-test-standalone.yaml

@@ -59,7 +59,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

.github/workflows/apisix_dev_push_docker_hub.yaml

@@ -70,5 +70,6 @@ jobs:
       - name: Run Trivy vulnerability scanner
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'apache/apisix:${{ APISIX_DOCKER_TAG }}'
+          image-ref: 'apache/apisix:${{ env.APISIX_DOCKER_TAG }}'
           severity: 'CRITICAL,HIGH'
+          exit-code: 1

README.md

@@ -155,7 +155,7 @@ The response indicates that apisix is running successfully:
 
 If you want to modify the default configuration of APISIX, you can use the following command to enter the APISIX container and modify the configuration file `./conf/config.yaml`, which will take effect after reloading APISIX. For details, please refer to `./conf/config-default.yaml`.
 
-```
+```shell
 docker exec -it apache-apisix bash
 ```
 
@@ -165,7 +165,7 @@ For more information, you can refer to the [APISIX Website](https://apisix.apach
 
 If you change your custom configuration, you can reload APISIX (without downtime) by issuing.
 
-```
+```shell
 docker exec -it apache-apisix apisix reload
 ```
 This will run the `apisix reload` command in your container.

all-in-one/apisix-dashboard/Dockerfile

@@ -53,7 +53,6 @@ RUN set -x \
     && mv /usr/local/apisix/deps/share/lua/5.1/apisix /usr/local/apisix \
     && apk del .builddeps build-base make unzip
 
-
 # Build etcd
 FROM alpine:3.13 AS etcd-stage
 

all-in-one/apisix/Dockerfile

@@ -31,7 +31,8 @@ USER root
 
 RUN wget https://github.com/etcd-io/etcd/releases/download/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
     && tar -zxvf etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
-    && mv etcd-${ETCD_VERSION}-linux-amd64/* /usr/bin/
+    && mv etcd-${ETCD_VERSION}-linux-amd64/* /usr/bin/ \
+    && rm /usr/local/openresty/bin/etcdctl
 
 
 WORKDIR /usr/local/apisix

dashboard/Dockerfile.alpine

@@ -24,7 +24,8 @@ RUN set -x \
     && apk add --no-cache --virtual .builddeps git \
     && git clone https://github.com/apache/apisix-dashboard.git -b ${APISIX_DASHBOARD_TAG} /usr/local/apisix-dashboard \
     && cd /usr/local/apisix-dashboard && git clean -Xdf \
-    && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash
+    && rm -f ./.githash && git log --pretty=format:"%h" -1 > ./.githash \
+    && rm /usr/local/openresty/bin/etcdctl
 
 FROM --platform=$BUILDPLATFORM golang:1.19 as api-builder
 

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

debian/Dockerfile

@@ -41,6 +41,7 @@ RUN set -ex; \
     && apt install -y apisix=${APISIX_VERSION}-0 \
     && apt-get purge -y --auto-remove \
     && rm -f /etc/apt/sources.list.d/openresty.list /etc/apt/sources.list.d/apisix.list \
+    && rm /usr/local/openresty/bin/etcdctl \
     && openresty -V \
     && apisix version
 

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

redhat/Dockerfile

@@ -33,7 +33,8 @@ ENV PATH=$PATH:/usr/local/openresty/luajit/bin:/usr/local/openresty/nginx/sbin:/
 
 # forward request and error logs to docker log collector
 RUN ln -sf /dev/stdout /usr/local/apisix/logs/access.log \
-    && ln -sf /dev/stderr /usr/local/apisix/logs/error.log
+    && ln -sf /dev/stderr /usr/local/apisix/logs/error.log \
+    && rm /usr/local/openresty/bin/etcdctl
 
 EXPOSE 9080 9443
 

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