You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2021/04/30 03:56:35 UTC
[apisix-docker] branch master updated: fix: remove
example/docker-compose.yml static ip address (#168)
This is an automated email from the ASF dual-hosted git repository.
spacewander 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 88147fc fix: remove example/docker-compose.yml static ip address (#168)
88147fc is described below
commit 88147fc181054fc7ec91ca1b256670f3e98171cc
Author: Jintao Zhang <ta...@163.com>
AuthorDate: Fri Apr 30 11:56:25 2021 +0800
fix: remove example/docker-compose.yml static ip address (#168)
---
example/docker-compose-alpine.yml | 7 -------
example/docker-compose.yml | 8 --------
2 files changed, 15 deletions(-)
diff --git a/example/docker-compose-alpine.yml b/example/docker-compose-alpine.yml
index 9e30c3b..5995a46 100644
--- a/example/docker-compose-alpine.yml
+++ b/example/docker-compose-alpine.yml
@@ -18,7 +18,6 @@ services:
- "9443:9443/tcp"
networks:
apisix:
- ipv4_address: 172.18.5.11
etcd:
image: bitnami/etcd:3.4.9
@@ -36,7 +35,6 @@ services:
- "2379:2379/tcp"
networks:
apisix:
- ipv4_address: 172.18.5.10
web1:
image: nginx:1.18.0-alpine
@@ -49,7 +47,6 @@ services:
- NGINX_PORT=80
networks:
apisix:
- ipv4_address: 172.18.5.12
web2:
image: nginx:1.18.0-alpine
@@ -62,11 +59,7 @@ services:
- NGINX_PORT=80
networks:
apisix:
- ipv4_address: 172.18.5.13
networks:
apisix:
driver: bridge
- ipam:
- config:
- - subnet: 172.18.0.0/16
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index aa50a57..0a3b53f 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -10,7 +10,6 @@ services:
- "9000:9000"
networks:
apisix:
- ipv4_address: 172.18.5.15
apisix:
image: apache/apisix:2.5-alpine
@@ -26,7 +25,6 @@ services:
- "9443:9443/tcp"
networks:
apisix:
- ipv4_address: 172.18.5.11
etcd:
image: bitnami/etcd:3.4.15
@@ -44,7 +42,6 @@ services:
- "2379:2379/tcp"
networks:
apisix:
- ipv4_address: 172.18.5.10
web1:
image: nginx:1.19.0-alpine
@@ -57,7 +54,6 @@ services:
- NGINX_PORT=80
networks:
apisix:
- ipv4_address: 172.18.5.12
web2:
image: nginx:1.19.0-alpine
@@ -70,11 +66,7 @@ services:
- NGINX_PORT=80
networks:
apisix:
- ipv4_address: 172.18.5.13
networks:
apisix:
driver: bridge
- ipam:
- config:
- - subnet: 172.18.0.0/16