Skip to content

Commit

Permalink
Merge branch 'main' into feat-23410
Browse files Browse the repository at this point in the history
* main:
  chore(deps): update python:3.13 docker digest to 08371fa (renovatebot#33282)
  build(deps): update dependency @opentelemetry/instrumentation-bunyan to v0.45.0 (renovatebot#33281)
  build(deps): update opentelemetry-js monorepo (renovatebot#33279)
  fix(deps): update ghcr.io/renovatebot/base-image docker tag to v9.27.5 (renovatebot#33278)
  chore(deps): update python:3.13 docker digest to c286f03 (renovatebot#33277)
  chore(deps): update containerbase/internal-tools action to v3.5.15 (renovatebot#33273)
  • Loading branch information
ivankatliarchuk committed Dec 26, 2024
2 parents 8c7a10b + 301c8f8 commit 6663a43
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ jobs:
show-progress: false

- name: docker-config
uses: containerbase/internal-tools@081e077becfd4a1a5f6c45271583b857e88bdbb4 # v3.5.14
uses: containerbase/internal-tools@c440de95307545d23ff0e0b57018147e02ae217f # v3.5.15
with:
command: docker-config

Expand Down
2 changes: 1 addition & 1 deletion lib/modules/manager/azure-pipelines/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ resources:
- container: linux
image: ubuntu:24.04
- container: python
image: python:3.13@sha256:9255d1993f6d28b8a1cd611b108adbdfa38cb7ccc46ddde8ea7d734b6c845e32
image: python:3.13@sha256:08371fabbdb8fd1c1256fa96492a27339bf60cba3cb26af7a2e5a56bc5060af4

stages:
- stage: StageOne
Expand Down
6 changes: 3 additions & 3 deletions tools/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,19 +5,19 @@ ARG BASE_IMAGE_TYPE=slim
# --------------------------------------
# slim image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.27.4@sha256:ae0eef7ac6c1eeef2a5243c796f1728b001f861d2f7286906b90eb2d6f4c88f5 AS slim-base
FROM ghcr.io/renovatebot/base-image:9.27.5@sha256:ca049112fbbe2a4863e91bdf360d34e70ed46de41b58165e6f9de641777bef01 AS slim-base

# --------------------------------------
# full image
# --------------------------------------
FROM ghcr.io/renovatebot/base-image:9.27.4-full@sha256:2f84df4244ded566623c82f4b5d076197eaad4a79db3ad368c979cc519724c2d AS full-base
FROM ghcr.io/renovatebot/base-image:9.27.5-full@sha256:ff1ee3198ecbd5443f161ec7bc6dfd2010c46dbff004fef080ea00925daa008b AS full-base

ENV RENOVATE_BINARY_SOURCE=global

# --------------------------------------
# build image
# --------------------------------------
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.27.4@sha256:ae0eef7ac6c1eeef2a5243c796f1728b001f861d2f7286906b90eb2d6f4c88f5 AS build
FROM --platform=$BUILDPLATFORM ghcr.io/renovatebot/base-image:9.27.5@sha256:ca049112fbbe2a4863e91bdf360d34e70ed46de41b58165e6f9de641777bef01 AS build

# We want a specific node version here
# renovate: datasource=node-version
Expand Down

0 comments on commit 6663a43

Please sign in to comment.