[incubator-apisix-docker] branch master updated: modify alpine build version && add readme for alpine (#55)

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wenming pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-apisix-docker.git


The following commit(s) were added to refs/heads/master by this push:
     new f831a29  modify alpine build version && add readme for alpine (#55)
f831a29 is described below

commit f831a299817b1925aa77f3ee9b089825c9b41872
Author: kv <gx...@163.com>
AuthorDate: Mon Jun 8 13:51:52 2020 +0800

    modify alpine build version && add readme for alpine (#55)
    
    *  drop allow_admin for docker compose test
    
    * add readme for apline based building image
---
 alpine/Dockerfile               | 4 ++--
 alpine/README.MD                | 5 +++++
 example/apisix_conf/config.yaml | 6 +++---
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/alpine/Dockerfile b/alpine/Dockerfile
index ad4c243..536960d 100644
--- a/alpine/Dockerfile
+++ b/alpine/Dockerfile
@@ -1,6 +1,6 @@
 FROM node:10-alpine3.11 AS build-stage
 
-ARG APISIX_VERSION=1.1
+ARG APISIX_VERSION=1.3
 
 RUN set -x \
     && /bin/sed -i 's,http://dl-cdn.alpinelinux.org,https://mirrors.aliyun.com,g' /etc/apk/repositories \
@@ -14,7 +14,7 @@ RUN set -x \
 
 FROM openresty/openresty:alpine-fat AS production-stage
 
-ARG APISIX_VERSION=1.1
+ARG APISIX_VERSION=1.3
 LABEL apisix_version="${APISIX_VERSION}"
 
 RUN set -x \
diff --git a/alpine/README.MD b/alpine/README.MD
new file mode 100644
index 0000000..e9f00e9
--- /dev/null
+++ b/alpine/README.MD
@@ -0,0 +1,5 @@
+### When building with `alpine` basic image, please specify `APISIX_VERSION` through `build-arg`
+
+```
+docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .
+```
\ No newline at end of file
diff --git a/example/apisix_conf/config.yaml b/example/apisix_conf/config.yaml
index 7e9c758..3c1c962 100644
--- a/example/apisix_conf/config.yaml
+++ b/example/apisix_conf/config.yaml
@@ -34,9 +34,9 @@ apisix:
   #    disk_path: "/tmp/disk_cache_two"
   #    cache_levels: "1:2"
 
-  allow_admin:                  # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
-    - 127.0.0.0/24              # If we don't set any IP list, then any IP access is allowed by default.
-    - 172.17.0.0/24
+#  allow_admin:                  # http://nginx.org/en/docs/http/ngx_http_access_module.html#allow
+#    - 127.0.0.0/24              # If we don't set any IP list, then any IP access is allowed by default.
+#    - 172.17.0.0/24
   #   - "::/64"
   # port_admin: 9180              # use a separate port