root
/
grafana
mirror of https://github.com/grafana/grafana.git
1
0
Fork 0
Code Issues Actions 82 Packages Projects Releases Wiki Activity

Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63639)

This commit is contained in:
Emil Tullstedt 2023-02-27 14:50:32 +01:00 committed by GitHub
parent 5f35995cd4
commit 110b05a0c0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 277 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

530
.drone.yml
View File

File diff suppressed because it is too large Load Diff

9
Dockerfile
View File

@ -1,8 +1,8 @@
# syntax=docker/dockerfile:1 # syntax=docker/dockerfile:1
ARG BASE_IMAGE=alpine:3.15 ARG BASE_IMAGE=alpine:3.17
ARG JS_IMAGE=node:18-alpine3.15 ARG JS_IMAGE=node:18-alpine3.17
ARG GO_IMAGE=golang:1.19.4-alpine3.17 ARG GO_IMAGE=golang:1.20.1-alpine3.17
ARG GO_SRC=go-builder ARG GO_SRC=go-builder
ARG JS_SRC=js-builder ARG JS_SRC=js-builder
@ -106,11 +106,12 @@ RUN if grep -i -q alpine /etc/issue; then \
# glibc support for alpine x86_64 only # glibc support for alpine x86_64 only
RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \ RUN if grep -i -q alpine /etc/issue && [ `arch` = "x86_64" ]; then \
wget -q -O /etc/apk/keys/sgerrand.rsa.pub https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub && \
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \ wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-2.35-r0.apk \
-O /tmp/glibc-2.35-r0.apk && \ -O /tmp/glibc-2.35-r0.apk && \
wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \ wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.35-r0/glibc-bin-2.35-r0.apk \
-O /tmp/glibc-bin-2.35-r0.apk && \ -O /tmp/glibc-bin-2.35-r0.apk && \
apk add --no-cache --allow-untrusted /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \ apk add --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /tmp/glibc-bin-2.35-r0.apk && \
rm -f /lib64/ld-linux-x86-64.so.2 && \ rm -f /lib64/ld-linux-x86-64.so.2 && \
ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \ ln -s /usr/glibc-compat/lib64/ld-linux-x86-64.so.2 /lib64/ld-linux-x86-64.so.2 && \
rm -f /tmp/glibc-2.35-r0.apk && \ rm -f /tmp/glibc-2.35-r0.apk && \

2
Makefile
View File

@ -176,7 +176,7 @@ build-docker-full-ubuntu: ## Build Docker image based on Ubuntu for development.
DOCKER_BUILDKIT=1 \ DOCKER_BUILDKIT=1 \
docker build \ docker build \
--build-arg BASE_IMAGE=ubuntu:20.04 \ --build-arg BASE_IMAGE=ubuntu:20.04 \
--build-arg GO_IMAGE=golang:1.19.4 \ --build-arg GO_IMAGE=golang:1.20.1 \
--tag grafana/grafana:dev-ubuntu . --tag grafana/grafana:dev-ubuntu .
##@ Services ##@ Services

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.15" base_image="${base_arch}alpine:3.17"
else else
libc="" libc=""
base_image="${base_arch}ubuntu:20.04" base_image="${base_arch}ubuntu:20.04"

2
pkg/build/docker/build.go
View File

@ -70,7 +70,7 @@ func BuildImage(version string, arch config.Architecture, grafanaDir string, use
} }
libc := "-musl" libc := "-musl"
baseImage := fmt.Sprintf("%salpine:3.15", baseArch) baseImage := fmt.Sprintf("%salpine:3.17", baseArch)
tagSuffix := "" tagSuffix := ""
if useUbuntu { if useUbuntu {
libc = "" libc = ""

2
pkg/util/errutil/log.go
View File

@ -31,7 +31,7 @@ func (l LogLevel) LogFunc(logger LogInterface) func(msg string, ctx ...interface
return logger.Info return logger.Info
case LevelWarn: case LevelWarn:
return logger.Warn return logger.Warn
default: // LevelUnknown and LevelError default: // LevelUnknown and LevelError.
return logger.Error return logger.Error
} }
} }

2
scripts/build/ci-build/Dockerfile
View File

@ -108,7 +108,7 @@ RUN rm dockerize-linux-amd64-v${DOCKERIZE_VERSION}.tar.gz
# Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's. # Use old Debian (LTS into 2024) in order to ensure binary compatibility with older glibc's.
FROM debian:buster-20220822 FROM debian:buster-20220822
ENV GOVERSION=1.19.4 \ ENV GOVERSION=1.20.1 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=18.12.0-1nodesource1 \ NODEVERSION=18.12.0-1nodesource1 \

4
scripts/drone/steps/lib.star
View File

@ -9,14 +9,14 @@ load(
) )
grabpl_version = "v3.0.21" grabpl_version = "v3.0.21"
build_image = "grafana/build-container:v1.7.1" build_image = "grafana/build-container:1.7.2"
publish_image = "grafana/grafana-ci-deploy:1.3.3" publish_image = "grafana/grafana-ci-deploy:1.3.3"
deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image" deploy_docker_image = "us.gcr.io/kubernetes-dev/drone/plugins/deploy-image"
alpine_image = "alpine:3.17.1" alpine_image = "alpine:3.17.1"
curl_image = "byrnedo/alpine-curl:0.1.8" curl_image = "byrnedo/alpine-curl:0.1.8"
windows_image = "mcr.microsoft.com/windows:1809" windows_image = "mcr.microsoft.com/windows:1809"
wix_image = "grafana/ci-wix:0.1.1" wix_image = "grafana/ci-wix:0.1.1"
go_image = "golang:1.19.4" go_image = "golang:1.20.1"
trigger_oss = { trigger_oss = {
"repo": [ "repo": [