[v10.2.x] Use latest grafana/docs-base image (#77309)

Use latest grafana/docs-base image (#77299)

* Use latest grafana/docs-base image

The pinned tag does not support recent shortcodes like `docs/public-preview`.



* Always pull the image



---------


(cherry picked from commit d8d7a40d13)

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
This commit is contained in:
Jack Baldry
2023-10-27 20:48:52 +03:00
committed by GitHub
parent 4d191cec05
commit 6d0eab8fca
3 changed files with 9 additions and 6 deletions
+7 -5
View File
@@ -1052,8 +1052,9 @@ steps:
true\n---\n'' > /hugo/content/docs/grafana/_index.md'
- cp -r docs/sources/* /hugo/content/docs/grafana/latest/
- cd /hugo && make prod
image: grafana/docs-base:dbd975af06
image: grafana/docs-base:latest
name: build-docs-website
pull: always
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
with its inputs.'
@@ -1345,8 +1346,9 @@ steps:
true\n---\n'' > /hugo/content/docs/grafana/_index.md'
- cp -r docs/sources/* /hugo/content/docs/grafana/latest/
- cd /hugo && make prod
image: grafana/docs-base:dbd975af06
image: grafana/docs-base:latest
name: build-docs-website
pull: always
- commands:
- '# It is required that code generated from Thema/CUE be committed and in sync
with its inputs.'
@@ -4367,7 +4369,7 @@ steps:
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM osixia/openldap:1.4.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/drone-downstream
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docker-puppeteer:1.1.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:dbd975af06
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM grafana/docs-base:latest
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM cypress/included:13.1.0
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM jwilder/dockerize:0.6.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM koalaman/shellcheck:stable
@@ -4401,7 +4403,7 @@ steps:
- trivy --exit-code 1 --severity HIGH,CRITICAL osixia/openldap:1.4.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/drone-downstream
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docker-puppeteer:1.1.0
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:dbd975af06
- trivy --exit-code 1 --severity HIGH,CRITICAL grafana/docs-base:latest
- trivy --exit-code 1 --severity HIGH,CRITICAL cypress/included:13.1.0
- trivy --exit-code 1 --severity HIGH,CRITICAL jwilder/dockerize:0.6.1
- trivy --exit-code 1 --severity HIGH,CRITICAL koalaman/shellcheck:stable
@@ -4630,6 +4632,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 1e843ec48dc89c92072df778c9ac4cb63bf0578f2005d4791624111a8a506c28
hmac: d6ca1af2c8f3bd02975317f97bf4e0ab47530f99be2f8dead5252950c16b4678
...
+1
View File
@@ -786,6 +786,7 @@ def build_docs_website_step():
"name": "build-docs-website",
# Use latest revision here, since we want to catch if it breaks
"image": images["docs"],
"pull": "always",
"commands": [
"mkdir -p /hugo/content/docs/grafana/latest",
"echo -e '---\\nredirectURL: /docs/grafana/latest/\\ntype: redirect\\nversioned: true\\n---\\n' > /hugo/content/docs/grafana/_index.md",
+1 -1
View File
@@ -29,7 +29,7 @@ images = {
"openldap": "osixia/openldap:1.4.0",
"drone_downstream": "grafana/drone-downstream",
"docker_puppeteer": "grafana/docker-puppeteer:1.1.0",
"docs": "grafana/docs-base:dbd975af06",
"docs": "grafana/docs-base:latest",
"cypress": "cypress/included:13.1.0",
"dockerize": "jwilder/dockerize:0.6.1",
"shellcheck": "koalaman/shellcheck:stable",