From f1d78e531968a0592fc5ceab98ea43b6145d4529 Mon Sep 17 00:00:00 2001
From: Luca Botti <lbotti@red.software.systems>
Date: Thu, 15 Feb 2024 19:05:08 +0100
Subject: [PATCH] Updated to latest tags fixes Issue-417

---
 all-in-one/apisix/Dockerfile          |  2 +-
 compose/dashboard-compose.yaml        |  2 +-
 compose/docker-compose-master.yaml    |  2 +-
 compose/docker-compose-release.yaml   |  2 +-
 docs/en/latest/manual.md              |  2 +-
 example/docker-compose-arm64.yml      |  6 +++---
 example/docker-compose-standalone.yml |  2 +-
 example/docker-compose.yml            | 10 +++++-----
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/all-in-one/apisix/Dockerfile b/all-in-one/apisix/Dockerfile
index 5de9d0d7..81b7232f 100644
--- a/all-in-one/apisix/Dockerfile
+++ b/all-in-one/apisix/Dockerfile
@@ -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
diff --git a/compose/dashboard-compose.yaml b/compose/dashboard-compose.yaml
index 45457a2e..13aacbe8 100644
--- a/compose/dashboard-compose.yaml
+++ b/compose/dashboard-compose.yaml
@@ -31,7 +31,7 @@ services:
       - apisix
 
   etcd:
-    image: bitnami/etcd:3.5.11
+    image: bitnami/etcd:3.5.12
     user: root
     restart: always
     volumes:
diff --git a/compose/docker-compose-master.yaml b/compose/docker-compose-master.yaml
index 6300aeba..c10707f8 100644
--- a/compose/docker-compose-master.yaml
+++ b/compose/docker-compose-master.yaml
@@ -34,7 +34,7 @@ services:
       - apisix
 
   etcd:
-    image: bitnami/etcd:3.5.11
+    image: bitnami/etcd:3.5.12
     user: root
     restart: always
     volumes:
diff --git a/compose/docker-compose-release.yaml b/compose/docker-compose-release.yaml
index 0384982a..ceb17f9d 100644
--- a/compose/docker-compose-release.yaml
+++ b/compose/docker-compose-release.yaml
@@ -34,7 +34,7 @@ services:
       - apisix
 
   etcd:
-    image: bitnami/etcd:3.5.11
+    image: bitnami/etcd:3.5.12
     user: root
     restart: always
     volumes:
diff --git a/docs/en/latest/manual.md b/docs/en/latest/manual.md
index 42179eac..e5746dc6 100644
--- a/docs/en/latest/manual.md
+++ b/docs/en/latest/manual.md
@@ -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:
diff --git a/example/docker-compose-arm64.yml b/example/docker-compose-arm64.yml
index b01a50e5..65706f07 100644
--- a/example/docker-compose-arm64.yml
+++ b/example/docker-compose-arm64.yml
@@ -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:
@@ -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
@@ -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
diff --git a/example/docker-compose-standalone.yml b/example/docker-compose-standalone.yml
index 7365f711..5b890e12 100644
--- a/example/docker-compose-standalone.yml
+++ b/example/docker-compose-standalone.yml
@@ -35,7 +35,7 @@ services:
       apisix:
 
   web1:
-    image: nginx:1.25.3-alpine
+    image: nginx:1.25.4-alpine
     restart: always
     volumes:
       - ./upstream/web1.conf:/etc/nginx/nginx.conf
diff --git a/example/docker-compose.yml b/example/docker-compose.yml
index 4220122f..7c6364dd 100644
--- a/example/docker-compose.yml
+++ b/example/docker-compose.yml
@@ -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
@@ -51,7 +51,7 @@ services:
       apisix:
 
   web1:
-    image: nginx:1.25.3-alpine
+    image: nginx:1.25.4-alpine
     restart: always
     volumes:
       - ./upstream/web1.conf:/etc/nginx/nginx.conf
@@ -63,7 +63,7 @@ services:
       apisix:
 
   web2:
-    image: nginx:1.25.3-alpine
+    image: nginx:1.25.4-alpine
     restart: always
     volumes:
       - ./upstream/web2.conf:/etc/nginx/nginx.conf
@@ -75,7 +75,7 @@ services:
       apisix:
 
   prometheus:
-    image: prom/prometheus:v2.45.3
+    image: prom/prometheus:v2.49.1
     restart: always
     volumes:
       - ./prometheus_conf/prometheus.yml:/etc/prometheus/prometheus.yml
@@ -85,7 +85,7 @@ services:
       apisix:
 
   grafana:
-    image: grafana/grafana:10.3.1
+    image: grafana/grafana:10.3.3
     restart: always
     ports:
       - "3000:3000"