Skip to content
This repository was archived by the owner on Dec 1, 2018. It is now read-only.

Commit 6c02a7f

Browse files
committed
switch to 5.0.4 with glibc base
1 parent 6d59f99 commit 6c02a7f

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

deploy/kube-config/influxdb/grafana.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: grafana
16-
image: k8s.gcr.io/heapster-grafana-amd64:v4.6.3
16+
image: k8s.gcr.io/heapster-grafana-amd64:v5.0.4
1717
ports:
1818
- containerPort: 3000
1919
protocol: TCP

grafana/Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
all: build
2121

22-
VERSION?=v4.6.3
23-
DEB_VERSION?=4.6.3
22+
VERSION?=v5.0.4
23+
DEB_VERSION?=5.0.4
2424

2525
PREFIX?=staging-k8s.gcr.io
2626
ARCH?=amd64
@@ -33,23 +33,23 @@ ML_PLATFORMS=linux/amd64,linux/arm,linux/arm64,linux/ppc64le,linux/s390x
3333

3434
# Set default base image dynamically for each arch
3535
ifeq ($(ARCH),amd64)
36-
BASEIMAGE?=busybox
36+
BASEIMAGE?=busybox:glibc
3737
CC=gcc
3838
endif
3939
ifeq ($(ARCH),arm)
40-
BASEIMAGE?=armhf/busybox
40+
BASEIMAGE?=armhf/busybox:glibc
4141
CC=arm-linux-gnueabihf-gcc
4242
endif
4343
ifeq ($(ARCH),arm64)
44-
BASEIMAGE?=aarch64/busybox
44+
BASEIMAGE?=aarch64/busybox:glibc
4545
CC=aarch64-linux-gnu-gcc
4646
endif
4747
ifeq ($(ARCH),ppc64le)
48-
BASEIMAGE?=ppc64le/busybox
48+
BASEIMAGE?=ppc64le/busybox:glibc
4949
CC=powerpc64le-linux-gnu-gcc
5050
endif
5151
ifeq ($(ARCH),s390x)
52-
BASEIMAGE?=s390x/busybox
52+
BASEIMAGE?=s390x/busybox:glibc
5353
CC=s390x-linux-gnu-gcc
5454
endif
5555

grafana/RELEASES.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Release Notes for Grafana container.
22

3-
## 5.0.3 (27-03-2018)
4-
- Support Grafana 5.0.3.
3+
## 5.0.4 (18-04-2018)
4+
- Support Grafana 5.0.4.
55

66
## 4.4.1 (18-07-2017)
77
- Image includes grafana.ini configuration file.

0 commit comments

Comments
 (0)