Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix v1.2 docker build issue #47

Merged
merged 7 commits into from
May 1, 2020
Merged

fix v1.2 docker build issue #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b2254c
changes:
totemofwolf Apr 25, 2020
7d7e25f
updated 1.2 version for alpine (#45)
totemofwolf Apr 26, 2020
eb093a9
changes: fix typo for (#45)
totemofwolf Apr 27, 2020
33176de
changes: `clone code` from `1.2` tag
totemofwolf Apr 27, 2020
dcd7dc6
changes: fix `error argument for docker -t ` in hooks/build
totemofwolf Apr 28, 2020
8cc59ab
add more detailed docker build doc for version from v1.2
totemofwolf Apr 28, 2020
de0ca0d
Merge branch 'master' into v1.2
moonming May 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@

1. install release version (Apache releases are beginning from version 0.9):
```
docker build -t apisix:1.1-alpine --build-arg APISIX_VERSION=1.1 -f alpine/Dockerfile alpine
# 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`

APISIX_VERSION=1.2
docker build -t apisix:${APISIX_VERSION}-alpine --build-arg APISIX_VERSION=${APISIX_VERSION} -f alpine/Dockerfile alpine
```

2. install master branch version, which has latest code(ONLY for the developer's convenience):
Expand Down
2 changes: 1 addition & 1 deletion alpine/hooks/build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
# hooks/build
# https://docs.docker.com/docker-cloud/builds/advanced/

docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME:${APISIX_VERSION}-alpine .
docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .
2 changes: 1 addition & 1 deletion centos/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG APISIX_VERSION=1.2
LABEL apisix_version="${APISIX_VERSION}"

RUN yum -y install yum-utils\
&& yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo \
&& 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 clean all \
Expand Down
5 changes: 5 additions & 0 deletions centos/hooks/build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#!/bin/bash
# hooks/build
# https://docs.docker.com/docker-cloud/builds/advanced/

docker build --build-arg APISIX_VERSION=$APISIX_VERSION -t $IMAGE_NAME .