public/grafana
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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`.

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

* Always pull the image

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>

---------

Signed-off-by: Jack Baldry <jack.baldry@grafana.com>
(cherry picked from commit d8d7a40d13)
This commit is contained in:
Jack Baldry
2023-11-27 11:14:29 +02:00
committed by GitHub
parent 4611f0c325
commit 9b014729cc
3 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.yml
+7 -5
View File
@@ -1054,8 +1054,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.'
@@ -1347,8 +1348,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.'
@@ -4349,7 +4351,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:9.5.1-node16.14.0-slim-chrome99-ff97
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM jwilder/dockerize:0.6.1
- trivy --exit-code 0 --severity UNKNOWN,LOW,MEDIUM koalaman/shellcheck:stable
@@ -4383,7 +4385,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:9.5.1-node16.14.0-slim-chrome99-ff97
- trivy --exit-code 1 --severity HIGH,CRITICAL jwilder/dockerize:0.6.1
- trivy --exit-code 1 --severity HIGH,CRITICAL koalaman/shellcheck:stable
@@ -4612,6 +4614,6 @@ kind: secret
name: gcr_credentials
---
kind: signature
hmac: 36f0250ca4de288c8514654343ba64b35374893ebae83912b7cb3631096be602
hmac: cc13247c5653a80493f5de0908d4b17120744fc78e51b509b9152627b4df408b
...
scripts/drone/steps/lib.star
+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",
scripts/drone/utils/images.star
+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:9.5.1-node16.14.0-slim-chrome99-ff97",
"dockerize": "jwilder/dockerize:0.6.1",
"shellcheck": "koalaman/shellcheck:stable",