Skip to content

H
helm3
Unverified Commit ef7b54b0 authored by Matthew Fisher's avatar Matthew Fisher Committed by GitHub
Browse files
Options

Merge pull request #5426 from tariq1890/up_docker 

update docker version and golang image version in helm
parents 0b3a09b2 528dc955
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
.circleci/config.yml
View file @ ef7b54b0
...@@ -4,13 +4,13 @@ jobs: ...@@ -4,13 +4,13 @@ jobs:
working_directory: /go/src/k8s.io/helm working_directory: /go/src/k8s.io/helm
parallelism: 3 parallelism: 3
docker: docker:
- image: golang:1.11 - image: golang:1.12
environment: environment:
PROJECT_NAME: "kubernetes-helm" PROJECT_NAME: "kubernetes-helm"
steps: steps:
- checkout - checkout
- setup_remote_docker: - setup_remote_docker:
version: 17.09.0-ce version: 18.06.0-ce
- restore_cache: - restore_cache:
keys: keys:
- glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }} - glide-{{ checksum "glide.yaml" }}-{{ checksum "glide.lock" }}
......
Makefile
View file @ ef7b54b0
DOCKER_REGISTRY ?= gcr.io DOCKER_REGISTRY ?= gcr.io
IMAGE_PREFIX ?= kubernetes-helm IMAGE_PREFIX ?= kubernetes-helm
DEV_IMAGE ?= golang:1.11 DEV_IMAGE ?= golang:1.12
SHORT_NAME ?= tiller SHORT_NAME ?= tiller
SHORT_NAME_RUDDER ?= rudder SHORT_NAME_RUDDER ?= rudder
TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64 TARGETS ?= darwin/amd64 linux/amd64 linux/386 linux/arm linux/arm64 linux/ppc64le linux/s390x windows/amd64
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment