Add 2.8.5 references (#10593)

**What this PR does / why we need it**: Update our docs to reference to the newly released version v2.8.5 **Which issue(s) this PR fixes**: N/A
grafana · Sep 14, 2023 · 03cd6c8 · 03cd6c8
1 parent bd487cb
commit 03cd6c8
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 18 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,20 +2,22 @@
 
 ### All Changes
 
-## 2.8.0 (2023-03-??)
+## 2.8.5 (2023-09-14)
 
-* [10188](https://github.com/grafana/loki/pull/10188) **shantanualsi**: Bump alpine version from 3.16.5 -> 3.16.7
+#### Loki
+
+##### Security
 
+* [10573](https://github.com/grafana/loki/pull/10573) **DylanGuedes**: Bump Docker base images to Alpine version 3.18.3 to mitigate CVE-2022-48174
 
-## 2.8.4
+## 2.8.4 (2023-08-11)
 
 #### Loki
 
 ##### Security
 
 * [10217](https://github.com/grafana/loki/pull/10217) *ashwanthgoli*: Fix CVE-2023-1255, CVE-2023-2650, CVE-2023-2975, CVE-2023-3446, CVE-2023-3817, and bump alpine image 3.18.2
 
-
 ## 2.8.3 (2023-07-21)
 
 #### Loki

diff --git a/docs/sources/clients/docker-driver/_index.md b/docs/sources/clients/docker-driver/_index.md
@@ -28,7 +28,7 @@ The Docker plugin must be installed on each Docker host that will be running con
 Run the following command to install the plugin, updating the release version if needed:
 
 ```bash
-docker plugin install grafana/loki-docker-driver:2.8.2 --alias loki --grant-all-permissions
+docker plugin install grafana/loki-docker-driver:2.8.5 --alias loki --grant-all-permissions
 ```
 
 To check installed plugins, use the `docker plugin ls` command. Plugins that
@@ -49,7 +49,7 @@ re-enabling and restarting Docker:
 
 ```bash
 docker plugin disable loki --force
-docker plugin upgrade loki grafana/loki-docker-driver:2.8.2 --grant-all-permissions
+docker plugin upgrade loki grafana/loki-docker-driver:2.8.5 --grant-all-permissions
 docker plugin enable loki
 systemctl restart docker
 ```

diff --git a/docs/sources/release-notes/v2-8.md b/docs/sources/release-notes/v2-8.md
@@ -22,6 +22,10 @@ As always, please read the [upgrade guide]({{<relref "../upgrading/#270">}}) bef
 
 ## Bug fixes
 
+### 2.8.5 (2023-09-14)
+
+* Update Docker base images to mitigate security vulnerability CVE-2022-48174
+
 ### 2.8.4 (2023-08-11)
 
 * Fix CVE-2023-1255, CVE-2023-2650, CVE-2023-2975, CVE-2023-3446, CVE-2023-3817, and bump alpine image 3.18.2
@@ -41,3 +45,5 @@ As always, please read the [upgrade guide]({{<relref "../upgrading/#270">}}) bef
 * Update go to 1.20.3 to address security vulnerabilities in the previous go version.
 * Update alpine image to 3.16.5 to address security vulnerabilities in the previous version.
 * *Promtail*: Fix journald support in amd64 binary build.
+
+For a full list of all changes and fixes, look at the [CHANGELOG](https://github.com/grafana/loki/blob/release-2.8.x/CHANGELOG.md).
diff --git a/examples/getting-started/docker-compose.yaml b/examples/getting-started/docker-compose.yaml
@@ -6,7 +6,7 @@ networks:
 
 services:
   read:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     command: "-config.file=/etc/loki/config.yaml -target=read"
     ports:
       - 3101:3100
@@ -27,7 +27,7 @@ services:
           - loki
 
   write:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     command: "-config.file=/etc/loki/config.yaml -target=write"
     ports:
       - 3102:3100
@@ -46,7 +46,7 @@ services:
       <<: *loki-dns
 
   promtail:
-    image: grafana/promtail:2.8.0
+    image: grafana/promtail:2.8.5
     volumes:
       - ./promtail-local-config.yaml:/etc/promtail/config.yaml:ro
       - /var/run/docker.sock:/var/run/docker.sock

diff --git a/production/docker-compose.yaml b/production/docker-compose.yaml
@@ -5,15 +5,15 @@ networks:
 
 services:
   loki:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     ports:
       - "3100:3100"
     command: -config.file=/etc/loki/local-config.yaml
     networks:
       - loki
 
   promtail:
-    image: grafana/promtail:2.8.0
+    image: grafana/promtail:2.8.5
     volumes:
       - /var/log:/var/log
     command: -config.file=/etc/promtail/config.yml

diff --git a/production/docker/docker-compose.yaml b/production/docker/docker-compose.yaml
@@ -16,7 +16,7 @@ services:
   # Loki would not have permissions to create the directories.
   # Therefore the init container changes permissions of the mounted directory.
   init:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     user: root
     entrypoint:
       - "chown"
@@ -72,7 +72,7 @@ services:
       - ./loki/:/var/log/
 
   promtail:
-    image: grafana/promtail:2.8.0
+    image: grafana/promtail:2.8.5
     volumes:
       - ./loki/:/var/log/
       - ./config:/etc/promtail/
@@ -114,7 +114,7 @@ services:
       - loki
 
   loki-read:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     volumes:
       - ./config:/etc/loki/
     ports:
@@ -136,7 +136,7 @@ services:
     # only needed for interactive debugging with dlv
 
   loki-write:
-    image: grafana/loki:2.8.0
+    image: grafana/loki:2.8.5
     volumes:
       - ./config:/etc/loki/
     ports:

diff --git a/production/ksonnet/loki-canary/config.libsonnet b/production/ksonnet/loki-canary/config.libsonnet
@@ -1,5 +1,5 @@
 {
   _images+:: {
-    loki_canary: 'grafana/loki-canary:2.8.0',
+    loki_canary: 'grafana/loki-canary:2.8.5',
   },
 }
diff --git a/production/ksonnet/loki/images.libsonnet b/production/ksonnet/loki/images.libsonnet
@@ -4,7 +4,7 @@
     memcached: 'memcached:1.5.17-alpine',
     memcachedExporter: 'prom/memcached-exporter:v0.6.0',
 
-    loki: 'grafana/loki:2.8.0',
+    loki: 'grafana/loki:2.8.5',
 
     distributor:: self.loki,
     ingester:: self.loki,

diff --git a/production/ksonnet/promtail/config.libsonnet b/production/ksonnet/promtail/config.libsonnet
@@ -1,6 +1,6 @@
 {
   _images+:: {
-    promtail: 'grafana/promtail:2.8.0',
+    promtail: 'grafana/promtail:2.8.5',
   },
 
   _config+:: {