IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-11-25 10:20:29 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Chore: Upgrade Go to 1.20.1 and Alpine to 3.17 (#63506)" (#63567)

Browse Source 
This reverts commit 747ddf7b33.
This commit is contained in:
Emil Tullstedt 2023-02-22 14:14:26 +01:00 committed by GitHub
parent a97e9a1e17
commit c72d18f5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 273 additions and 274 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.17 ARG BASE_IMAGE=alpine:3.15
ARG JS_IMAGE=node:18-alpine3.17 ARG JS_IMAGE=node:18-alpine3.15
ARG GO_IMAGE=golang:1.20.1-alpine3.17 ARG GO_IMAGE=golang:1.19.4-alpine3.17
ARG GO_SRC=go-builder ARG GO_SRC=go-builder
ARG JS_SRC=js-builder ARG JS_SRC=js-builder
@ -106,12 +106,11 @@ 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 --force-overwrite --no-cache /tmp/glibc-2.35-r0.apk /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 && \
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.20.1 \ --build-arg GO_IMAGE=golang:1.19.4 \
--tag grafana/grafana:dev-ubuntu . --tag grafana/grafana:dev-ubuntu .
##@ Services ##@ Services

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.20.1 \ ENV GOVERSION=1.19.4 \
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:1.7.2" build_image = "grafana/build-container:v1.7.1"
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.20.1" go_image = "golang:1.19.4"
trigger_oss = { trigger_oss = {
"repo": [ "repo": [