Update software versions and fix security refs

This commit is contained in:
yeasy
2026-04-18 19:04:14 -07:00
parent 1bed644e5e
commit 077e55f494
4 changed files with 9 additions and 7 deletions
-1
View File
@@ -16,7 +16,6 @@ Fedora 的快速发布周期(每 6 个月发布新版本)决定了它的用
Docker 支持以下版本的 [Fedora](https://getfedora.org/) 操作系统: Docker 支持以下版本的 [Fedora](https://getfedora.org/) 操作系统:
* 41
* 42 * 42
* 43 * 43
+3 -1
View File
@@ -411,7 +411,9 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
- name: Run Trivy vulnerability scan - name: Run Trivy vulnerability scan
uses: aquasecurity/trivy-action@master # 安全提醒:2026 年 3 月 Trivy GitHub Actions 遭受供应链攻击,
# 76 个版本标签被劫持。务必使用不可变的 commit SHA 引用,而非可变标签。
uses: aquasecurity/trivy-action@57a97c7e7821a5776cebc9bb87c984fa69cba8f1 # v0.35.0
with: with:
image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
format: 'sarif' format: 'sarif'
+4 -3
View File
@@ -17,12 +17,12 @@ ELK (ElasticsearchLogstashKibana) 是目前业界最流行的开源日志
#### 1. 编写 Compose 文件 #### 1. 编写 Compose 文件
1. 编写 `compose.yaml` ( `docker-compose.yml`) 配置如下示例基于 Elasticsearch 8.x当前最新大版本为 9.x请根据需要选择版本并查阅 [Elastic 官方文档](https://www.elastic.co/docs/) 确认配置兼容性): 1. 编写 `compose.yaml` ( `docker-compose.yml`) 配置如下示例基于 Elasticsearch 9.x查阅 [Elastic 官方文档](https://www.elastic.co/docs/) 确认最新版本与配置兼容性):
```yaml ```yaml
services: services:
elasticsearch: elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.17.0 image: docker.elastic.co/elasticsearch/elasticsearch:9.3.3
container_name: elasticsearch container_name: elasticsearch
environment: environment:
- "discovery.type=single-node" - "discovery.type=single-node"
@@ -36,7 +36,7 @@ services:
- logging - logging
kibana: kibana:
image: docker.elastic.co/kibana/kibana:8.17.0 image: docker.elastic.co/kibana/kibana:9.3.3
container_name: kibana container_name: kibana
environment: environment:
- ELASTICSEARCH_HOSTS=http://elasticsearch:9200 - ELASTICSEARCH_HOSTS=http://elasticsearch:9200
@@ -48,6 +48,7 @@ services:
- logging - logging
fluentd: fluentd:
# elasticsearch8 插件通过 REST API 与 ES 9.x 兼容
image: fluent/fluentd-kubernetes-daemonset:v1.17-debian-elasticsearch8-1 image: fluent/fluentd-kubernetes-daemonset:v1.17-debian-elasticsearch8-1
container_name: fluentd container_name: fluentd
environment: environment:
@@ -101,7 +101,7 @@ cAdvisor 是 Google 开发的容器监控工具,提供比 `docker stats` 更
```yaml ```yaml
services: services:
cadvisor: cadvisor:
image: ghcr.io/google/cadvisor:v0.56.0 image: ghcr.io/google/cadvisor:v0.56.2
container_name: cadvisor container_name: cadvisor
ports: ports:
- "8080:8080" - "8080:8080"
@@ -192,7 +192,7 @@ services:
- monitoring - monitoring
cadvisor: cadvisor:
image: ghcr.io/google/cadvisor:v0.56.0 image: ghcr.io/google/cadvisor:v0.56.2
container_name: cadvisor container_name: cadvisor
ports: ports:
- "8080:8080" - "8080:8080"