luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

update circleci builds to use golang 1.12.9

This commit is contained in:
Mahmood Ali 2019-08-23 12:26:47 -04:00
parent 6430fb5444
commit 74bc5a2c0b
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml
View File

@ -70,7 +70,7 @@ executors:
go:
working_directory: /go/src/github.com/hashicorp/nomad
docker:
- image: hashicorpnomad/ci-build-image:20190812
- image: hashicorpnomad/ci-build-image:20190823
go-machine:
working_directory: ~/go/src/github.com/hashicorp/nomad
machine:
@ -243,7 +243,7 @@ commands:
parameters:
version:
type: string
default: "1.12.7"
default: "1.12.9"
steps:
- run:
name: install golang << parameters.version >>

13
Dockerfile.ci
View File

@ -1,4 +1,4 @@
FROM circleci/golang:1.12.7
FROM circleci/golang:1.12.9
ENV PROTOC_VERSION 3.6.1
ENV VAULT_VERSION 1.1.0
ENV CONSUL_VERSION 1.4.0
@ -8,11 +8,6 @@ RUN sudo apt-get update \
&& sudo apt-get install -y unzip \
&& sudo rm -rf /var/lib/apt/lists/*
## Add the git repo and run bootstrap to install CI dependencies, then remove
## the extra checkout to save image size.
COPY . /tmp/build
RUN cd /tmp/build && sudo chown -R $(whoami) /tmp/build && make bootstrap && rm -rf /tmp/build
RUN wget -q -O /tmp/protoc.zip https://github.com/google/protobuf/releases/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip \
&& unzip /tmp/protoc.zip -d /tmp/protoc3 \
&& sudo mv /tmp/protoc3/bin/* /usr/local/bin/ \
@ -28,3 +23,9 @@ RUN wget -q -O /tmp/consul.zip https://releases.hashicorp.com/consul/${CONSUL_VE
&& sudo unzip -d /usr/local/bin /tmp/consul.zip \
&& rm -rf /tmp/consul*
## Add the git repo and run bootstrap to install CI dependencies, then remove
## the extra checkout to save image size.
COPY GNUmakefile /tmp/build/GNUmakefile
COPY scripts /tmp/build/scripts
RUN cd /tmp/build && sudo chown -R $(whoami) /tmp/build && make deps lint-deps && rm -rf /tmp/build

7
GNUmakefile
View File

@ -382,7 +382,8 @@ ui-screenshots-local:
@cd scripts/screenshots/src && SCREENSHOTS_DIR="../screenshots" node index.js
.PHONY: ci-image
ci-image: IMAGE_TAG=$(shell date +%Y%m%d)
ci-image:
@echo "==> Building CI Image hashicorpnomad/ci-build-image:$(date %Y%m%d)"
@docker build . -f Dockerfile.ci -t hashicorpnomad/ci-build-image:$(date %Y%m%d)
@echo "To push the image, run `docker push -t hashicorpnomad/ci-build-image:$(date %Y%m%d)"
@echo "==> Building CI Image hashicorpnomad/ci-build-image:$(IMAGE_TAG)"
@docker build . -f Dockerfile.ci -t hashicorpnomad/ci-build-image:$(IMAGE_TAG)
@echo "To push the image, run 'docker push -t hashicorpnomad/ci-build-image:$(IMAGE_TAG)'"