[1.10.0] Update node version, and change base image of markdownlint, …

…update GOPROXY for docker file (#182) (#234) * Cherry pick #182 Signed-off-by: Lubron Zhan <[email protected]> * Update GOPROXY for dockerfile Signed-off-by: Lubron Zhan <[email protected]> --------- Signed-off-by: Lubron Zhan <[email protected]>
vmware-tanzu · May 2, 2024 · fa86382 · fa86382
1 parent 53caa07
commit fa86382
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -26,9 +26,9 @@ jobs:
         run: cd hack/tools && make golangci-lint
 
       - name: Install npm
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install markdown-lint tool
         run: npm install -g markdownlint-cli

diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,9 +21,9 @@ jobs:
         run: cd hack/tools && make golangci-lint
 
       - name: Install npm
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '14'
+          node-version: '20'
 
       - name: Install markdown-lint tool
         run: npm install -g markdownlint-cli

diff --git a/Dockerfile-for-github-ci b/Dockerfile-for-github-ci
@@ -11,7 +11,7 @@ WORKDIR /workspace
 COPY go.mod go.mod
 COPY go.sum go.sum
 
-ENV GOPROXY=direct
+ENV GOPROXY=https://proxy.golang.org,direct
 RUN go mod download
 
 # Copy the go source

diff --git a/Makefile b/Makefile
@@ -189,7 +189,7 @@ lint-markdown: ## Lint the project's markdown
 ifdef GITHUB_ACTIONS
 	markdownlint -c md-config.json .
 else
-	docker run -i --rm -v "$$(pwd)":/work $(CACHE_IMAGE_REGISTRY)/tmknom/markdownlint -c /work/md-config.json .
+	docker run -i --rm -v "$$(pwd)":/work ghcr.io/tmknom/dockerfiles/markdownlint -c /work/md-config.json .
 endif
 
 .PHONY: lint-shell