upstream/grafana
1
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2026-02-03 20:49:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 43

Build: Update alpine version to 3.23.2 (#116527)

Browse source
This commit is contained in:
Matheus Macabu 2026-01-20 12:54:42 +01:00 committed by GitHub
parent f0a9aed7b1
commit 67e250f4dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Dockerfile
View file

@ -14,7 +14,7 @@ ARG JS_SRC=js-builder
# Dependabot cannot update dependencies listed in ARGs # Dependabot cannot update dependencies listed in ARGs
# By using FROM instructions we can delegate dependency updates to dependabot # By using FROM instructions we can delegate dependency updates to dependabot
FROM alpine:3.23.0 AS alpine-base FROM alpine:3.23.2 AS alpine-base
FROM ubuntu:22.04 AS ubuntu-base FROM ubuntu:22.04 AS ubuntu-base
FROM golang:1.25.6-alpine AS go-builder-base FROM golang:1.25.6-alpine AS go-builder-base
FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base FROM --platform=${JS_PLATFORM} node:24-alpine AS js-builder-base

2
packaging/docker/build.sh
View file

@ -59,7 +59,7 @@ docker_build () {
esac esac
if [ $UBUNTU_BASE = "0" ]; then if [ $UBUNTU_BASE = "0" ]; then
libc="-musl" libc="-musl"
base_image="${base_arch}alpine:3.18.5" base_image="${base_arch}alpine:3.23.2"
else else
libc="" libc=""
base_image="${base_arch}ubuntu:22.04" base_image="${base_arch}ubuntu:22.04"

2
pkg/build/daggerbuild/artifacts/package_targz.go
View file

@ -206,7 +206,7 @@ func (t *Tarball) Builder(ctx context.Context, opts *pipeline.ArtifactContainerO
version := t.Version version := t.Version
container := opts.Client.Container(). container := opts.Client.Container().
From("alpine:3.18.4"). From("alpine:3.23.2").
WithExec([]string{"apk", "add", "--update", "tar"}). WithExec([]string{"apk", "add", "--update", "tar"}).
WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("echo %s > VERSION", version)}) WithExec([]string{"/bin/sh", "-c", fmt.Sprintf("echo %s > VERSION", version)})

2
pkg/build/daggerbuild/frontend/node.go
View file

@ -9,7 +9,7 @@ import (
// NodeVersionContainer returns a container whose `stdout` will return the node version from the '.nvmrc' file in the directory 'src'. // NodeVersionContainer returns a container whose `stdout` will return the node version from the '.nvmrc' file in the directory 'src'.
func NodeVersion(d *dagger.Client, src *dagger.Directory) *dagger.Container { func NodeVersion(d *dagger.Client, src *dagger.Directory) *dagger.Container {
return d.Container().From("alpine:3.17"). return d.Container().From("alpine:3.23.2").
WithMountedDirectory("/src", src). WithMountedDirectory("/src", src).
WithWorkdir("/src"). WithWorkdir("/src").
WithExec([]string{"cat", ".nvmrc"}) WithExec([]string{"cat", ".nvmrc"})