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

Jump to bottom

fix: example containers using old images #542

Closed
wants to merge 5 commits into from
Closed

fix: example containers using old images #542

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7f45f9
Updated Tags for docker images, fixes issue #417
lucabotti Jan 24, 2024
6faec21
Merge branch 'apache:master' into issue-417
lucabotti Feb 1, 2024
64978eb
Updated Tags for docker images, fixes issue #417
lucabotti Feb 12, 2024
f1d78e5
Updated to latest tags fixes Issue-417
lucabotti Feb 15, 2024
9e7a163
Fixed multiple blank line issue
lucabotti Feb 15, 2024
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
2 changes: 1 addition & 1 deletion all-in-one/apisix/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#

ARG ENABLE_PROXY=false
ARG ETCD_VERSION=v3.5.4
ARG ETCD_VERSION=v3.5.12

# Build Apache APISIX
FROM apache/apisix:latest
Expand Down
2 changes: 1 addition & 1 deletion compose/dashboard-compose.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ services:
- apisix

etcd:
image: bitnami/etcd:3.4.9
image: bitnami/etcd:3.5.12
user: root
restart: always
volumes:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
- apisix

etcd:
image: bitnami/etcd:3.4.9
image: bitnami/etcd:3.5.12
user: root
restart: always
volumes:
Expand Down
2 changes: 1 addition & 1 deletion compose/docker-compose-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ services:
- apisix

etcd:
image: bitnami/etcd:3.4.9
image: bitnami/etcd:3.5.12
user: root
restart: always
volumes:
Expand Down
2 changes: 1 addition & 1 deletion docs/en/latest/manual.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ docker run -it --name etcd-server \
-p 2380:2380 \
--network apisix \
--ip 172.18.5.10 \
--env ALLOW_NONE_AUTHENTICATION=yes bitnami/etcd:3.4.9
--env ALLOW_NONE_AUTHENTICATION=yes bitnami/etcd:3.5.12
```

> Note:
Expand Down
6 changes: 3 additions & 3 deletions example/docker-compose-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
apisix:

etcd:
image: rancher/coreos-etcd:v3.4.15-arm64
image: rancher/coreos-etcd:v3.4.16-arm64
user: root
restart: always
volumes:
Expand All @@ -53,7 +53,7 @@ services:
apisix:

web1:
image: nginx:1.19.10-alpine
image: nginx:1.25.4-alpine
restart: always
volumes:
- ./upstream/web1.conf:/etc/nginx/nginx.conf
Expand All @@ -65,7 +65,7 @@ services:
apisix:

web2:
image: nginx:1.19.10-alpine
image: nginx:1.25.4-alpine
restart: always
volumes:
- ./upstream/web2.conf:/etc/nginx/nginx.conf
Expand Down
2 changes: 1 addition & 1 deletion example/docker-compose-standalone.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ services:
apisix:

web1:
image: nginx:1.19.0-alpine
image: nginx:1.25.4-alpine
restart: always
volumes:
- ./upstream/web1.conf:/etc/nginx/nginx.conf
Expand Down
10 changes: 5 additions & 5 deletions example/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ services:
apisix:

etcd:
image: bitnami/etcd:3.5.11
image: bitnami/etcd:3.5.12
restart: always
volumes:
- etcd_data:/bitnami/etcd
Expand All @@ -51,7 +51,7 @@ services:
apisix:

web1:
image: nginx:1.19.0-alpine
image: nginx:1.25.4-alpine
restart: always
volumes:
- ./upstream/web1.conf:/etc/nginx/nginx.conf
Expand All @@ -63,7 +63,7 @@ services:
apisix:

web2:
image: nginx:1.19.0-alpine
image: nginx:1.25.4-alpine
restart: always
volumes:
- ./upstream/web2.conf:/etc/nginx/nginx.conf
Expand All @@ -75,7 +75,7 @@ services:
apisix:

prometheus:
image: prom/prometheus:v2.25.0
image: prom/prometheus:v2.49.1
restart: always
volumes:
- ./prometheus_conf/prometheus.yml:/etc/prometheus/prometheus.yml
Expand All @@ -85,7 +85,7 @@ services:
apisix:

grafana:
image: grafana/grafana:7.3.7
image: grafana/grafana:10.3.3
restart: always
ports:
- "3000:3000"
Expand Down
Loading