[apisix-ingress-docker] branch main updated: feat: update to golang 1.16 (#5)

[kv...@apache.org]

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

kvn pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-docker.git


The following commit(s) were added to refs/heads/main by this push:
     new 0515ed7  feat: update to golang 1.16 (#5)
0515ed7 is described below

commit 0515ed7ddd3d3c7efb5f9ead69a79addf729d868
Author: kv <gx...@163.com>
AuthorDate: Tue Jan 4 10:43:37 2022 +0800

    feat: update to golang 1.16 (#5)
---
 Dockerfile | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 1641ee6..9df4811 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,9 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-FROM golang:1.13.8 AS build-env
+FROM golang:1.16 AS build-env
+
+ARG INGRESS_VERSION=1.4.0
+ARG ENABLE_PROXY=false
 
-ARG INGRESS_VERSION=1.3.0
 LABEL ingress_version="${INGRESS_VERSION}"
 RUN rm -rf /etc/localtime \
     && ln -s /usr/share/zoneinfo/Hongkong /etc/localtime \
@@ -27,7 +29,8 @@ RUN wget https://github.com/apache/apisix-ingress-controller/archive/${INGRESS_V
     && tar zxvf ${INGRESS_VERSION}.tar.gz \
     && ln -s apisix-ingress-controller-${INGRESS_VERSION} controller \
     && cd ./controller \
-    && GOPROXY=https://goproxy.io,direct make build
+    && if [ "$ENABLE_PROXY" = "true" ] ; then go env -w GOPROXY=https://goproxy.cn,direct ; fi \
+    && make build
 
 FROM alpine:3.13.5