Update Dockerfile and CircleCI (#417)

This commit is contained in:
Matteo Gazzetta 2018-12-10 23:01:23 +01:00 committed by KUOKA Yusuke
parent 2a35b6864c
commit 4b22d4fc78
2 changed files with 14 additions and 12 deletions

View File

@ -4,7 +4,7 @@ jobs:
build: build:
docker: docker:
- image: circleci/golang:1.11.0 - image: circleci/golang:1.11.2
working_directory: /go/src/github.com/roboll/helmfile working_directory: /go/src/github.com/roboll/helmfile
steps: steps:
- checkout - checkout
@ -16,7 +16,7 @@ jobs:
test: test:
docker: docker:
- image: circleci/golang:1.11.0 - image: circleci/golang:1.11.2
working_directory: /go/src/github.com/roboll/helmfile working_directory: /go/src/github.com/roboll/helmfile
steps: steps:
- checkout - checkout
@ -26,9 +26,12 @@ jobs:
# thanks to https://raw.githubusercontent.com/weaveworks/launcher/master/.circleci/config.yml # thanks to https://raw.githubusercontent.com/weaveworks/launcher/master/.circleci/config.yml
integration_tests: integration_tests:
machine: true machine:
image: circleci/classic:201808-01
environment: environment:
CHANGE_MINIKUBE_NONE_USER: true CHANGE_MINIKUBE_NONE_USER: true
MINIKUBE_WANTUPDATENOTIFICATION: false
MINIKUBE_WANTREPORTERRORPROMPT: false
steps: steps:
- checkout - checkout
- run: mkdir ~/build - run: mkdir ~/build
@ -38,7 +41,7 @@ jobs:
- run: - run:
name: Install helm name: Install helm
environment: environment:
HELM_VERSION: v2.9.0 HELM_VERSION: v2.12.0
command: | command: |
HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
curl -Lo ${HELM_FILENAME} "https://kubernetes-helm.storage.googleapis.com/${HELM_FILENAME}" curl -Lo ${HELM_FILENAME} "https://kubernetes-helm.storage.googleapis.com/${HELM_FILENAME}"
@ -49,14 +52,13 @@ jobs:
name: Deploy minikube name: Deploy minikube
environment: environment:
CHANGE_MINIKUBE_NONE_USER: true CHANGE_MINIKUBE_NONE_USER: true
K8S_VERSION: v1.9.0 K8S_VERSION: v1.12.3
MINIKUBE_VERSION: v0.25.2 MINIKUBE_VERSION: v0.30.0
command: | command: |
curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl curl -Lo kubectl https://storage.googleapis.com/kubernetes-release/release/${K8S_VERSION}/bin/linux/amd64/kubectl
chmod +x kubectl && sudo mv kubectl /usr/local/bin/ chmod +x kubectl && sudo mv kubectl /usr/local/bin/
curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64 curl -Lo minikube https://storage.googleapis.com/minikube/releases/${MINIKUBE_VERSION}/minikube-linux-amd64
chmod +x minikube && sudo mv minikube /usr/local/bin/ chmod +x minikube && sudo mv minikube /usr/local/bin/
sudo minikube config set WantReportErrorPrompt false
sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION} sudo -E minikube start --vm-driver=none --kubernetes-version=${K8S_VERSION}
sudo -E minikube update-context sudo -E minikube update-context
- run: - run:
@ -72,7 +74,7 @@ jobs:
release: release:
docker: docker:
- image: circleci/golang:1.11.0 - image: circleci/golang:1.11.2
working_directory: /go/src/github.com/roboll/helmfile working_directory: /go/src/github.com/roboll/helmfile
steps: steps:
- checkout - checkout

View File

@ -1,4 +1,4 @@
FROM golang:1.10.1-alpine3.7 as builder FROM golang:1.11.2-alpine3.8 as builder
RUN apk add --no-cache make git RUN apk add --no-cache make git
WORKDIR /go/src/github.com/roboll/helmfile/ WORKDIR /go/src/github.com/roboll/helmfile/
@ -7,14 +7,14 @@ RUN make static-linux
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
FROM alpine:3.7 FROM alpine:3.8
RUN apk add --no-cache ca-certificates git bash curl RUN apk add --no-cache ca-certificates git bash curl
ARG HELM_VERSION=v2.11.0 ARG HELM_VERSION=v2.12.0
ARG HELM_LOCATION="https://kubernetes-helm.storage.googleapis.com" ARG HELM_LOCATION="https://kubernetes-helm.storage.googleapis.com"
ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz" ARG HELM_FILENAME="helm-${HELM_VERSION}-linux-amd64.tar.gz"
ARG HELM_SHA256="02a4751586d6a80f6848b58e7f6bd6c973ffffadc52b4c06652db7def02773a1" ARG HELM_SHA256="9f96a6e4fc52b5df906da381532cc2eb2f3f57cc203ccaec2b11cf5dc26a7dfc"
RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \ RUN wget ${HELM_LOCATION}/${HELM_FILENAME} && \
sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \ sha256sum ${HELM_FILENAME} | grep -q "${HELM_SHA256}" && \
tar zxf ${HELM_FILENAME} && mv /linux-amd64/helm /usr/local/bin/ && \ tar zxf ${HELM_FILENAME} && mv /linux-amd64/helm /usr/local/bin/ && \