Skip to content

N
nexpie-grafana-theme
Commit 073851f9 by Kyle Brandt Committed by Carl Bergquist
Options

Build: Upgrades to golang 1.12.6 (#17542)

parent 6170a039
Showing with 17 additions and 15 deletions
.circleci/config.yml
...@@ -19,7 +19,7 @@ version: 2 ...@@ -19,7 +19,7 @@ version: 2
jobs: jobs:
mysql-integration-test: mysql-integration-test:
docker: docker:
- image: circleci/golang:1.12.4 - image: circleci/golang:1.12.6
- image: circleci/mysql:5.6-ram - image: circleci/mysql:5.6-ram
environment: environment:
MYSQL_ROOT_PASSWORD: rootpass MYSQL_ROOT_PASSWORD: rootpass
...@@ -39,7 +39,7 @@ jobs: ...@@ -39,7 +39,7 @@ jobs:
postgres-integration-test: postgres-integration-test:
docker: docker:
- image: circleci/golang:1.12.4 - image: circleci/golang:1.12.6
- image: circleci/postgres:9.3-ram - image: circleci/postgres:9.3-ram
environment: environment:
POSTGRES_USER: grafanatest POSTGRES_USER: grafanatest
...@@ -58,7 +58,7 @@ jobs: ...@@ -58,7 +58,7 @@ jobs:
cache-server-test: cache-server-test:
docker: docker:
- image: circleci/golang:1.12.4 - image: circleci/golang:1.12.6
- image: circleci/redis:4-alpine - image: circleci/redis:4-alpine
- image: memcached - image: memcached
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
...@@ -116,7 +116,7 @@ jobs: ...@@ -116,7 +116,7 @@ jobs:
backend-lint: backend-lint:
docker: docker:
- image: circleci/golang:1.12.4 - image: circleci/golang:1.12.6
environment: environment:
# we need CGO because of go-sqlite3 # we need CGO because of go-sqlite3
CGO_ENABLED: 1 CGO_ENABLED: 1
...@@ -148,7 +148,7 @@ jobs: ...@@ -148,7 +148,7 @@ jobs:
test-backend: test-backend:
docker: docker:
- image: circleci/golang:1.12.4 - image: circleci/golang:1.12.6
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -158,7 +158,7 @@ jobs: ...@@ -158,7 +158,7 @@ jobs:
build-all: build-all:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -202,7 +202,7 @@ jobs: ...@@ -202,7 +202,7 @@ jobs:
build: build:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -228,7 +228,7 @@ jobs: ...@@ -228,7 +228,7 @@ jobs:
build-fast-backend: build-fast-backend:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -245,7 +245,7 @@ jobs: ...@@ -245,7 +245,7 @@ jobs:
build-fast-frontend: build-fast-frontend:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -269,7 +269,7 @@ jobs: ...@@ -269,7 +269,7 @@ jobs:
build-fast-package: build-fast-package:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -296,7 +296,7 @@ jobs: ...@@ -296,7 +296,7 @@ jobs:
build-fast-save: build-fast-save:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -382,7 +382,7 @@ jobs: ...@@ -382,7 +382,7 @@ jobs:
build-enterprise: build-enterprise:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
...@@ -414,7 +414,7 @@ jobs: ...@@ -414,7 +414,7 @@ jobs:
build-all-enterprise: build-all-enterprise:
docker: docker:
- image: grafana/build-container:1.2.6 - image: grafana/build-container:1.2.7
working_directory: /go/src/github.com/grafana/grafana working_directory: /go/src/github.com/grafana/grafana
steps: steps:
- checkout - checkout
......
scripts/build/ci-build/Dockerfile
...@@ -35,6 +35,8 @@ RUN apt-get update && \ ...@@ -35,6 +35,8 @@ RUN apt-get update && \
curl \ curl \
git \ git \
make \ make \
cmake \
libssl-dev \
xz-utils && \ xz-utils && \
git clone https://github.com/tpoechtrager/osxcross.git /tmp/osxcross && \ git clone https://github.com/tpoechtrager/osxcross.git /tmp/osxcross && \
curl -L ${OSX_SDK_URL}/${OSX_SDK}.tar.xz -o /tmp/osxcross/tarballs/${OSX_SDK}.tar.xz && \ curl -L ${OSX_SDK_URL}/${OSX_SDK}.tar.xz -o /tmp/osxcross/tarballs/${OSX_SDK}.tar.xz && \
...@@ -69,7 +71,7 @@ RUN apt-get update && \ ...@@ -69,7 +71,7 @@ RUN apt-get update && \
# base image to crossbuild grafana # base image to crossbuild grafana
FROM ubuntu:14.04 FROM ubuntu:14.04
ENV GOVERSION=1.12.4 \ ENV GOVERSION=1.12.6 \
PATH=/usr/local/go/bin:$PATH \ PATH=/usr/local/go/bin:$PATH \
GOPATH=/go \ GOPATH=/go \
NODEVERSION=10.14.2 NODEVERSION=10.14.2
......
scripts/build/ci-build/build-deploy.sh
#!/bin/bash #!/bin/bash
_version="1.2.6" _version="1.2.7"
_tag="grafana/build-container:${_version}" _tag="grafana/build-container:${_version}"
docker build -t $_tag . docker build -t $_tag .
......
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