From a759ecdf30822ba4aeb658ef098798e935bd4b36 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Wed, 20 Nov 2024 00:14:44 +0000
Subject: [PATCH 01/10] 24.03-lts update loki to 3.3.0

---
 loki/3.3.0/24.03-lts/Dockerfile        | 34 +++++++++++++++++++++
 loki/3.3.0/24.03-lts/local-config.yaml | 42 ++++++++++++++++++++++++++
 loki/meta.yml                          |  4 ++-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.0/24.03-lts/Dockerfile
 create mode 100644 loki/3.3.0/24.03-lts/local-config.yaml

diff --git a/loki/3.3.0/24.03-lts/Dockerfile b/loki/3.3.0/24.03-lts/Dockerfile
new file mode 100644
index 00000000..e3ec5da3
--- /dev/null
+++ b/loki/3.3.0/24.03-lts/Dockerfile
@@ -0,0 +1,34 @@
+ARG BASE=openeuler/openeuler:24.03-lts
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.0
+
+RUN yum -y update && \
+    yum -y install wget && \
+    yum clean all
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x86_64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi && \
+    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
+    rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
+
+COPY local-config.yaml /etc/loki/local-config.yaml
+
+RUN groupadd -g 10001 loki && \
+    adduser -u 10001 -g loki loki && \
+    mkdir -p /loki/rules && \
+    mkdir -p /loki/rules-temp && \
+    chown -R loki:loki /etc/loki /loki
+
+USER 10001
+EXPOSE 3100
+ENTRYPOINT [ "loki" ]
+CMD ["-config.file=/etc/loki/local-config.yaml"]
diff --git a/loki/3.3.0/24.03-lts/local-config.yaml b/loki/3.3.0/24.03-lts/local-config.yaml
new file mode 100644
index 00000000..119b9395
--- /dev/null
+++ b/loki/3.3.0/24.03-lts/local-config.yaml
@@ -0,0 +1,42 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: tsdb
+      object_store: filesystem
+      schema: v12
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false
\ No newline at end of file
diff --git a/loki/meta.yml b/loki/meta.yml
index 4abc8204..291c216b 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -7,4 +7,6 @@
 3.2.1-oe2203sp4:
   path: loki/3.2.1/22.03-lts-sp4/Dockerfile
 3.2.1-oe2403lts:
-  path: loki/3.2.1/24.03-lts/Dockerfile
\ No newline at end of file
+  path: loki/3.2.1/24.03-lts/Dockerfile
+3.3.0-oe2403lts:
+  path: loki/3.3.0/24.03-lts/Dockerfile
\ No newline at end of file
-- 
Gitee


From d72a5fe0b340dc730270da0313228ceb81e205dc Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Wed, 20 Nov 2024 00:15:13 +0000
Subject: [PATCH 02/10] 22.03-lts-sp3 update loki to 3.3.0

---
 loki/3.3.0/22.03-lts-sp3/Dockerfile        | 34 ++++++++++++++++++
 loki/3.3.0/22.03-lts-sp3/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.0/22.03-lts-sp3/Dockerfile
 create mode 100644 loki/3.3.0/22.03-lts-sp3/local-config.yaml

diff --git a/loki/3.3.0/22.03-lts-sp3/Dockerfile b/loki/3.3.0/22.03-lts-sp3/Dockerfile
new file mode 100644
index 00000000..bbc45594
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp3/Dockerfile
@@ -0,0 +1,34 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp3
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.0
+
+RUN yum -y update && \
+    yum -y install wget && \
+    yum clean all
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x86_64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi && \
+    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
+    rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
+
+COPY local-config.yaml /etc/loki/local-config.yaml
+
+RUN groupadd -g 10001 loki && \
+    adduser -u 10001 -g loki loki && \
+    mkdir -p /loki/rules && \
+    mkdir -p /loki/rules-temp && \
+    chown -R loki:loki /etc/loki /loki
+
+USER 10001
+EXPOSE 3100
+ENTRYPOINT [ "loki" ]
+CMD ["-config.file=/etc/loki/local-config.yaml"]
diff --git a/loki/3.3.0/22.03-lts-sp3/local-config.yaml b/loki/3.3.0/22.03-lts-sp3/local-config.yaml
new file mode 100644
index 00000000..119b9395
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp3/local-config.yaml
@@ -0,0 +1,42 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: tsdb
+      object_store: filesystem
+      schema: v12
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false
\ No newline at end of file
diff --git a/loki/meta.yml b/loki/meta.yml
index 291c216b..5722f8a0 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -9,4 +9,6 @@
 3.2.1-oe2403lts:
   path: loki/3.2.1/24.03-lts/Dockerfile
 3.3.0-oe2403lts:
-  path: loki/3.3.0/24.03-lts/Dockerfile
\ No newline at end of file
+  path: loki/3.3.0/24.03-lts/Dockerfile
+3.3.0-oe2203sp3:
+  path: loki/3.3.0/22.03-lts-sp3/Dockerfile
\ No newline at end of file
-- 
Gitee


From 25fee97d21eb330cc1382e2bb623647bca7b44c7 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Wed, 20 Nov 2024 00:15:45 +0000
Subject: [PATCH 03/10] 22.03-lts-sp4 update loki to 3.3.0

---
 loki/3.3.0/22.03-lts-sp4/Dockerfile        | 34 ++++++++++++++++++
 loki/3.3.0/22.03-lts-sp4/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.0/22.03-lts-sp4/Dockerfile
 create mode 100644 loki/3.3.0/22.03-lts-sp4/local-config.yaml

diff --git a/loki/3.3.0/22.03-lts-sp4/Dockerfile b/loki/3.3.0/22.03-lts-sp4/Dockerfile
new file mode 100644
index 00000000..b92fa0d8
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp4/Dockerfile
@@ -0,0 +1,34 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp4
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.0
+
+RUN yum -y update && \
+    yum -y install wget && \
+    yum clean all
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x86_64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi && \
+    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
+    rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
+
+COPY local-config.yaml /etc/loki/local-config.yaml
+
+RUN groupadd -g 10001 loki && \
+    adduser -u 10001 -g loki loki && \
+    mkdir -p /loki/rules && \
+    mkdir -p /loki/rules-temp && \
+    chown -R loki:loki /etc/loki /loki
+
+USER 10001
+EXPOSE 3100
+ENTRYPOINT [ "loki" ]
+CMD ["-config.file=/etc/loki/local-config.yaml"]
diff --git a/loki/3.3.0/22.03-lts-sp4/local-config.yaml b/loki/3.3.0/22.03-lts-sp4/local-config.yaml
new file mode 100644
index 00000000..119b9395
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp4/local-config.yaml
@@ -0,0 +1,42 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: tsdb
+      object_store: filesystem
+      schema: v12
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false
\ No newline at end of file
diff --git a/loki/meta.yml b/loki/meta.yml
index 5722f8a0..d0c7917e 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -11,4 +11,6 @@
 3.3.0-oe2403lts:
   path: loki/3.3.0/24.03-lts/Dockerfile
 3.3.0-oe2203sp3:
-  path: loki/3.3.0/22.03-lts-sp3/Dockerfile
\ No newline at end of file
+  path: loki/3.3.0/22.03-lts-sp3/Dockerfile
+3.3.0-oe2203sp4:
+  path: loki/3.3.0/22.03-lts-sp4/Dockerfile
\ No newline at end of file
-- 
Gitee


From c90c13f90655dbfde1824243ba3a1fdee0fe116c Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Wed, 20 Nov 2024 00:16:16 +0000
Subject: [PATCH 04/10] 22.03-lts-sp1 update loki to 3.3.0

---
 loki/3.3.0/22.03-lts-sp1/Dockerfile        | 34 ++++++++++++++++++
 loki/3.3.0/22.03-lts-sp1/local-config.yaml | 42 ++++++++++++++++++++++
 loki/meta.yml                              |  4 ++-
 3 files changed, 79 insertions(+), 1 deletion(-)
 create mode 100644 loki/3.3.0/22.03-lts-sp1/Dockerfile
 create mode 100644 loki/3.3.0/22.03-lts-sp1/local-config.yaml

diff --git a/loki/3.3.0/22.03-lts-sp1/Dockerfile b/loki/3.3.0/22.03-lts-sp1/Dockerfile
new file mode 100644
index 00000000..e1b7f0c0
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp1/Dockerfile
@@ -0,0 +1,34 @@
+ARG BASE=openeuler/openeuler:22.03-lts-sp1
+FROM ${BASE}
+
+ARG TARGETARCH
+ARG BUILDARCH
+ARG VERSION=3.3.0
+
+RUN yum -y update && \
+    yum -y install wget && \
+    yum clean all
+
+RUN if [ "$TARGETARCH" = "amd64" ]; then \
+      BUILDARCH="x86_64"; \
+    elif [ "$TARGETARCH" = "arm64" ]; then \
+      BUILDARCH="aarch64"; \
+    fi && \
+    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
+    rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
+
+COPY local-config.yaml /etc/loki/local-config.yaml
+
+RUN groupadd -g 10001 loki && \
+    adduser -u 10001 -g loki loki && \
+    mkdir -p /loki/rules && \
+    mkdir -p /loki/rules-temp && \
+    chown -R loki:loki /etc/loki /loki
+
+USER 10001
+EXPOSE 3100
+ENTRYPOINT [ "loki" ]
+CMD ["-config.file=/etc/loki/local-config.yaml"]
diff --git a/loki/3.3.0/22.03-lts-sp1/local-config.yaml b/loki/3.3.0/22.03-lts-sp1/local-config.yaml
new file mode 100644
index 00000000..119b9395
--- /dev/null
+++ b/loki/3.3.0/22.03-lts-sp1/local-config.yaml
@@ -0,0 +1,42 @@
+auth_enabled: false
+
+server:
+  http_listen_port: 3100
+
+common:
+  instance_addr: 127.0.0.1
+  path_prefix: /loki
+  storage:
+    filesystem:
+      chunks_directory: /loki/chunks
+      rules_directory: /loki/rules
+  replication_factor: 1
+  ring:
+    kvstore:
+      store: inmemory
+
+schema_config:
+  configs:
+    - from: 2020-10-24
+      store: tsdb
+      object_store: filesystem
+      schema: v12
+      index:
+        prefix: index_
+        period: 24h
+
+ruler:
+  alertmanager_url: http://localhost:9093
+
+# By default, Loki will send anonymous, but uniquely-identifiable usage and configuration
+# analytics to Grafana Labs. These statistics are sent to https://stats.grafana.org/
+#
+# Statistics help us better understand how Loki is used, and they show us performance
+# levels for most users. This helps us prioritize features and documentation.
+# For more information on what's sent, look at
+# https://github.com/grafana/loki/blob/main/pkg/usagestats/stats.go
+# Refer to the buildReport method to see what goes into a report.
+#
+# If you would like to disable reporting, uncomment the following lines:
+#analytics:
+#  reporting_enabled: false
\ No newline at end of file
diff --git a/loki/meta.yml b/loki/meta.yml
index d0c7917e..fb98a2bb 100644
--- a/loki/meta.yml
+++ b/loki/meta.yml
@@ -13,4 +13,6 @@
 3.3.0-oe2203sp3:
   path: loki/3.3.0/22.03-lts-sp3/Dockerfile
 3.3.0-oe2203sp4:
-  path: loki/3.3.0/22.03-lts-sp4/Dockerfile
\ No newline at end of file
+  path: loki/3.3.0/22.03-lts-sp4/Dockerfile
+3.3.0-oe2203sp1:
+  path: loki/3.3.0/22.03-lts-sp1/Dockerfile
\ No newline at end of file
-- 
Gitee


From 26388f3840c20a87823cc633af1b4724b3299e99 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:22:01 +0000
Subject: [PATCH 05/10] update loki/3.3.0/22.03-lts-sp1/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/22.03-lts-sp1/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/loki/3.3.0/22.03-lts-sp1/Dockerfile b/loki/3.3.0/22.03-lts-sp1/Dockerfile
index e1b7f0c0..06cdf8ce 100644
--- a/loki/3.3.0/22.03-lts-sp1/Dockerfile
+++ b/loki/3.3.0/22.03-lts-sp1/Dockerfile
@@ -22,9 +22,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
 
 COPY local-config.yaml /etc/loki/local-config.yaml
 
-RUN groupadd -g 10001 loki && \
-    adduser -u 10001 -g loki loki && \
-    mkdir -p /loki/rules && \
+RUN mkdir -p /loki/rules && \
     mkdir -p /loki/rules-temp && \
     chown -R loki:loki /etc/loki /loki
 
-- 
Gitee


From 49298470fa59d2100dc859406ffa0e0beb656818 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:23:08 +0000
Subject: [PATCH 06/10] update loki/3.3.0/22.03-lts-sp3/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/22.03-lts-sp3/Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/loki/3.3.0/22.03-lts-sp3/Dockerfile b/loki/3.3.0/22.03-lts-sp3/Dockerfile
index bbc45594..ede8b3f3 100644
--- a/loki/3.3.0/22.03-lts-sp3/Dockerfile
+++ b/loki/3.3.0/22.03-lts-sp3/Dockerfile
@@ -5,26 +5,20 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=3.3.0
 
-RUN yum -y update && \
-    yum -y install wget && \
-    yum clean all
-
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x86_64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
       BUILDARCH="aarch64"; \
     fi && \
-    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
     yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
     rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
 
 COPY local-config.yaml /etc/loki/local-config.yaml
 
-RUN groupadd -g 10001 loki && \
-    adduser -u 10001 -g loki loki && \
-    mkdir -p /loki/rules && \
+RUN mkdir -p /loki/rules && \
     mkdir -p /loki/rules-temp && \
     chown -R loki:loki /etc/loki /loki
 
-- 
Gitee


From c5d66f4493273ecc2b20b14673ed39627eedbe9e Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:23:35 +0000
Subject: [PATCH 07/10] update loki/3.3.0/22.03-lts-sp1/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/22.03-lts-sp1/Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/loki/3.3.0/22.03-lts-sp1/Dockerfile b/loki/3.3.0/22.03-lts-sp1/Dockerfile
index 06cdf8ce..74845ef5 100644
--- a/loki/3.3.0/22.03-lts-sp1/Dockerfile
+++ b/loki/3.3.0/22.03-lts-sp1/Dockerfile
@@ -5,18 +5,14 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=3.3.0
 
-RUN yum -y update && \
-    yum -y install wget && \
-    yum clean all
-
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x86_64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
       BUILDARCH="aarch64"; \
     fi && \
-    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
     yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
     rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
 
-- 
Gitee


From 6d7bbf09e3768372cc1031e9836498905b4fb68b Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:23:59 +0000
Subject: [PATCH 08/10] update loki/3.3.0/22.03-lts-sp4/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/22.03-lts-sp4/Dockerfile | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/loki/3.3.0/22.03-lts-sp4/Dockerfile b/loki/3.3.0/22.03-lts-sp4/Dockerfile
index b92fa0d8..7ebb9202 100644
--- a/loki/3.3.0/22.03-lts-sp4/Dockerfile
+++ b/loki/3.3.0/22.03-lts-sp4/Dockerfile
@@ -5,18 +5,14 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=3.3.0
 
-RUN yum -y update && \
-    yum -y install wget && \
-    yum clean all
-
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x86_64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
       BUILDARCH="aarch64"; \
     fi && \
-    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
     yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
     rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
 
-- 
Gitee


From 2242cf06bf8dcf20a545ef3b5e76880bedc1cfd1 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:24:12 +0000
Subject: [PATCH 09/10] update loki/3.3.0/22.03-lts-sp4/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/22.03-lts-sp4/Dockerfile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/loki/3.3.0/22.03-lts-sp4/Dockerfile b/loki/3.3.0/22.03-lts-sp4/Dockerfile
index 7ebb9202..24ec4fe0 100644
--- a/loki/3.3.0/22.03-lts-sp4/Dockerfile
+++ b/loki/3.3.0/22.03-lts-sp4/Dockerfile
@@ -18,9 +18,7 @@ RUN if [ "$TARGETARCH" = "amd64" ]; then \
 
 COPY local-config.yaml /etc/loki/local-config.yaml
 
-RUN groupadd -g 10001 loki && \
-    adduser -u 10001 -g loki loki && \
-    mkdir -p /loki/rules && \
+RUN mkdir -p /loki/rules && \
     mkdir -p /loki/rules-temp && \
     chown -R loki:loki /etc/loki /loki
 
-- 
Gitee


From df42d72b8659a4ba9101f3897d852e7c219d7fc2 Mon Sep 17 00:00:00 2001
From: openeuler_bot <673672685@qq.com>
Date: Mon, 25 Nov 2024 01:24:42 +0000
Subject: [PATCH 10/10] update loki/3.3.0/24.03-lts/Dockerfile.

Signed-off-by: openeuler_bot <673672685@qq.com>
---
 loki/3.3.0/24.03-lts/Dockerfile | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/loki/3.3.0/24.03-lts/Dockerfile b/loki/3.3.0/24.03-lts/Dockerfile
index e3ec5da3..5dfa1bd6 100644
--- a/loki/3.3.0/24.03-lts/Dockerfile
+++ b/loki/3.3.0/24.03-lts/Dockerfile
@@ -5,26 +5,20 @@ ARG TARGETARCH
 ARG BUILDARCH
 ARG VERSION=3.3.0
 
-RUN yum -y update && \
-    yum -y install wget && \
-    yum clean all
-
 RUN if [ "$TARGETARCH" = "amd64" ]; then \
       BUILDARCH="x86_64"; \
     elif [ "$TARGETARCH" = "arm64" ]; then \
       BUILDARCH="aarch64"; \
     fi && \
-    wget -O grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
-    wget -O grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-logcli.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/logcli-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-loki.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/loki-${VERSION}.${BUILDARCH}.rpm && \
+    curl -fSL -o grafana-promtail.rpm https://github.com/grafana/loki/releases/download/v${VERSION}/promtail-${VERSION}.${BUILDARCH}.rpm && \
     yum -y install grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm && \
     rm -rf grafana-loki.rpm grafana-promtail.rpm grafana-logcli.rpm
 
 COPY local-config.yaml /etc/loki/local-config.yaml
 
-RUN groupadd -g 10001 loki && \
-    adduser -u 10001 -g loki loki && \
-    mkdir -p /loki/rules && \
+RUN mkdir -p /loki/rules && \
     mkdir -p /loki/rules-temp && \
     chown -R loki:loki /etc/loki /loki
 
-- 
Gitee