This is an automated email from the ASF dual-hosted git repository. membphis pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/apisix-docker.git
The following commit(s) were added to refs/heads/master by this push: new 71be19e change: remove incubator in repo url. (#71) 71be19e is described below commit 71be19e1318dab7ab0b4b91dc60bd240909f6744 Author: Jared Tan <jian....@daocloud.io> AuthorDate: Wed Aug 12 23:01:27 2020 +0800 change: remove incubator in repo url. (#71) --- alpine-dev/Dockerfile | 2 +- alpine/Dockerfile | 4 ++-- build.md | 2 +- centos/Dockerfile | 2 +- example/gen-config-yaml.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/alpine-dev/Dockerfile b/alpine-dev/Dockerfile index 7afced1..0abd98a 100644 --- a/alpine-dev/Dockerfile +++ b/alpine-dev/Dockerfile @@ -9,7 +9,7 @@ RUN set -x \ pkgconfig \ cmake \ git \ - && luarocks install https://github.com/apache/incubator-apisix/raw/master/rockspec/apisix-master-0.rockspec --tree=/usr/local/apisix/deps \ + && luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-master-0.rockspec --tree=/usr/local/apisix/deps \ && cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/master-0/bin/apisix /usr/bin/ \ && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \ && sed -i "1s@.*@$bin@" /usr/bin/apisix \ diff --git a/alpine/Dockerfile b/alpine/Dockerfile index 536960d..007fc61 100644 --- a/alpine/Dockerfile +++ b/alpine/Dockerfile @@ -5,7 +5,7 @@ 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 \ && apk add --no-cache --virtual .build-deps git \ - && git clone -b ${APISIX_VERSION} https://github.com/apache/incubator-apisix.git /tmp/apisix \ + && git clone -b ${APISIX_VERSION} https://github.com/apache/apisix.git /tmp/apisix \ && cd /tmp/apisix \ && git submodule init \ && git submodule update \ @@ -26,7 +26,7 @@ RUN set -x \ pkgconfig \ cmake \ git \ - && luarocks install https://github.com/apache/incubator-apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \ + && luarocks install https://github.com/apache/apisix/raw/master/rockspec/apisix-${APISIX_VERSION}-0.rockspec --tree=/usr/local/apisix/deps \ && cp -v /usr/local/apisix/deps/lib/luarocks/rocks-5.1/apisix/${APISIX_VERSION}-0/bin/apisix /usr/bin/ \ && bin='#! /usr/local/openresty/luajit/bin/luajit\npackage.path = "/usr/local/apisix/?.lua;" .. package.path' \ && sed -i "1s@.*@$bin@" /usr/bin/apisix \ diff --git a/build.md b/build.md index ff43f85..1978239 100644 --- a/build.md +++ b/build.md @@ -4,7 +4,7 @@ 1. install release version (Apache releases are beginning from version 0.9): ``` -# Assign Apache release version number to variable `APISIX_VERSION`, for example: 1.2 . The latest version can be find at `https://github.com/apache/incubator-apisix/releases` +# Assign Apache release version number to variable `APISIX_VERSION`, for example: 1.2 . The latest version can be find at `https://github.com/apache/apisix/releases` APISIX_VERSION=1.2 docker build -t apisix:${APISIX_VERSION}-alpine --build-arg APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine diff --git a/centos/Dockerfile b/centos/Dockerfile index 35d0b51..81f76ca 100644 --- a/centos/Dockerfile +++ b/centos/Dockerfile @@ -6,7 +6,7 @@ LABEL apisix_version="${APISIX_VERSION}" RUN yum -y install yum-utils\ && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo \ && yum install -y openresty \ - && yum install -y https://github.com/apache/incubator-apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.el7.noarch.rpm \ + && yum install -y https://github.com/apache/apisix/releases/download/$APISIX_VERSION/apisix-$APISIX_VERSION-0.el7.noarch.rpm \ && yum clean all \ && sed -i 's/PASS_MAX_DAYS\t99999/PASS_MAX_DAYS\t60/g' /etc/login.defs diff --git a/example/gen-config-yaml.sh b/example/gen-config-yaml.sh index 6bdc436..b2d9eeb 100644 --- a/example/gen-config-yaml.sh +++ b/example/gen-config-yaml.sh @@ -2,7 +2,7 @@ export etcd_url='http://172.18.5.10:2379' -wget https://raw.githubusercontent.com/apache/incubator-apisix/master/conf/config.yaml +wget https://raw.githubusercontent.com/apache/apisix/master/conf/config.yaml sed -i -e ':a' -e 'N' -e '$!ba' -e "s/allow_admin[a-z: #\/._]*\n\( *- [0-9a-zA-Z: #\/._',]*\n*\)*//g" config.yaml