Merge pull request #257 from zhaixiaojuan/main

grafana:10.2.2 Modify GOPROXY to fix download timeout
Loongson-Cloud-Community · Aug 30, 2024 · e403bf0 · e403bf0
2 parents f0ebb2c + 2c10391
commit e403bf0
Showing 1 changed file with 6 additions and 17 deletions.
diff --git a/grafana/grafana/10.2.2/0001-support-loong64.patch b/grafana/grafana/10.2.2/0001-support-loong64.patch
@@ -1,15 +1,5 @@
-From 01c54783d51cd28ed6a04f2465b9f7212b2a426a Mon Sep 17 00:00:00 2001
-From: zhangguanzhang <[email protected]>
-Date: Mon, 4 Dec 2023 14:31:04 +0800
-Subject: [PATCH] support loong64
-
----
- Dockerfile | 34 +++++++---------------------------
- Makefile   | 11 ++++++-----
- 2 files changed, 13 insertions(+), 32 deletions(-)
-
 diff --git a/Dockerfile b/Dockerfile
-index fc73ee1d65..43b03089df 100644
+index fc73ee1..f6274a4 100644
 --- a/Dockerfile
 +++ b/Dockerfile
 @@ -10,26 +10,6 @@ ARG JS_SRC=js-builder
@@ -39,11 +29,13 @@ index fc73ee1d65..43b03089df 100644
  FROM ${GO_IMAGE} as go-builder
 
  ARG COMMIT_SHA=""
-@@ -49,7 +29,7 @@ COPY go.* ./
+@@ -48,8 +28,8 @@ WORKDIR /tmp/grafana
+ COPY go.* ./
  COPY .bingo .bingo
 
- RUN go mod download
+-RUN go mod download
 -RUN if [[ "$BINGO" = "true" ]]; then \
++RUN export GOPROXY=https://goproxy.cn && go mod download
 +RUN if [ "$BINGO" = "true" ]; then \
        go install github.com/bwplotka/bingo@latest && \
        bingo get -v; \
@@ -80,7 +72,7 @@ index fc73ee1d65..43b03089df 100644
 
  EXPOSE 3000
 diff --git a/Makefile b/Makefile
-index 54287b0ff0..c998f84389 100644
+index 54287b0..c998f84 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -212,25 +212,26 @@ shellcheck: $(SH_FILES) ## Run checks for shell scripts.
@@ -123,6 +115,3 @@ index 54287b0ff0..c998f84389 100644
  	$(DOCKER_BUILD_ARGS)
 
  ##@ Services
--- 
-2.25.1
-