Skip to content
This repository has been archived by the owner on Feb 9, 2024. It is now read-only.

Commit

Permalink
Merge branch 'main' into viceice-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice authored Feb 9, 2024
2 parents fcd9da9 + 9439301 commit 76f63be
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 12 deletions.
11 changes: 5 additions & 6 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,29 +26,28 @@ jobs:
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1

- uses: sigstore/cosign-installer@1fc5bd396d372bee37d608f955b336615edf79c8 # v3.2.0
- uses: sigstore/cosign-installer@e1523de7571e31dbe865fd2e80c5c7c23ae71eb4 # v3.4.0

- name: Docker registry login
if: github.ref_name == 'main' && false
run: |
echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin
echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.repository_owner }} --password-stdin
if: github.ref_name == 'main' && false

- name: Build and Publish
uses: containerbase/internal-tools@9f7cb1408116743c56ef02d432761ed7f5ecdd2a # v3.0.23
uses: containerbase/internal-tools@e7bd2e8cedd99c9b24982865534cb7c9bf88620b # v3.0.55
with:
command: docker-builder
platforms: ${{ github.ref_name == 'main' && 'linux/amd64,linux/arm64' || '' }}
image-prefixes: ghcr.io/${{ github.repository_owner }}
last-only: true
dry-run: ${{ github.ref_name != 'main' || true }}


- name: Build and Publish slim
if: github.ref_name == 'main' && false
uses: containerbase/internal-tools@9f7cb1408116743c56ef02d432761ed7f5ecdd2a # v3.0.23
uses: containerbase/internal-tools@e7bd2e8cedd99c9b24982865534cb7c9bf88620b # v3.0.55
with:
command: docker-builder
image-prefixes: ghcr.io/${{ github.repository_owner }}
last-only: true
tag-suffix: slim
if: github.ref_name == 'main' && false
2 changes: 1 addition & 1 deletion .github/workflows/trivy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@ jobs:
format: 'sarif'
output: 'trivy-results.sarif'

- uses: github/codeql-action/upload-sarif@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8
- uses: github/codeql-action/upload-sarif@dc021d495cb77b369e4d9d04a501700fd83b8c51 # v2.24.0
with:
sarif_file: trivy-results.sarif
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# renovate: datasource=npm depName=renovate versioning=npm
ARG RENOVATE_VERSION=37.83.4
ARG RENOVATE_VERSION=37.180.1

# Base image
#============
FROM ghcr.io/renovatebot/base-image:1.2.0@sha256:2baa209ff4342f65b78abf0eb5cca74c1f7701aa33964a9a69da7eadef9aba96 AS base
FROM ghcr.io/renovatebot/base-image:1.22.0@sha256:59606f80b6194a99f9d7d4a2667dcc468b8717af793165cd8624bff440b67a78 AS base

LABEL name="renovate"
LABEL org.opencontainers.image.source="https://github.com/renovatebot/renovate" \
Expand Down
2 changes: 1 addition & 1 deletion docs/bitbucket.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The pipeline should also work on shared runners.
## bitbucket-pipelines.yml

```yml
image: renovate/renovate:37.81.4
image: renovate/renovate:37.172.2

definitions:
caches:
Expand Down
2 changes: 1 addition & 1 deletion docs/gitlab.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ This sample will configure the Renovate slim image.
The following pipeline runs Renovate normally on `main` branch and for self-update it runs in [`dryRun`](https://docs.renovatebot.com/self-hosted-configuration/#dryrun) mode.

```yml
image: renovate/renovate:37.81.4
image: renovate/renovate:37.172.2

variables:
LOG_LEVEL: debug
Expand Down
2 changes: 1 addition & 1 deletion docs/jenkins.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ The following pipeline runs Renovate normally on the default branch (eg. `main`
pipeline {
agent {
docker {
image 'renovate/renovate:37.81.4'
image 'renovate/renovate:37.172.2'
args '-v /tmp:/tmp --group-add 0'
}
}
Expand Down

0 comments on commit 76f63be

Please sign in to comment.