Skip to content

Commit c4acc6e

Browse files
committed
Fix build
Install the dependencies directly into the build container rather than at runtime. This will keep the build more stable than relying on master.
1 parent 3991660 commit c4acc6e

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

.circleci/Dockerfile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,9 @@ RUN git clone https://github.com/google/jsonnet && \
77
git -C jsonnet checkout v0.12.1 && \
88
make -C jsonnet LDFLAGS=-static
99

10+
FROM prom/prometheus:v2.8.1
11+
1012
FROM circleci/golang:1.10.3-stretch
1113
COPY --from=0 jsonnet/jsonnet /usr/bin
14+
COPY --from=1 /bin/promtool /usr/bin
15+
RUN go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb

.circleci/config.yml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@ version: 2
22
jobs:
33
build:
44
docker:
5-
- image: csmarchbanks/kubernetes-mixin-build:jsonnet-0.12.1
5+
- image: csmarchbanks/kubernetes-mixin-build:0.1.1
66

77
working_directory: /go/src/github.com/kubernetes-monitoring/kubernetes-mixin
88
steps:
99
- checkout
10-
- run:
11-
name: Install tools
12-
command: |
13-
go get github.com/jsonnet-bundler/jsonnet-bundler/cmd/jb
14-
go get github.com/prometheus/prometheus/cmd/promtool
1510
- run: jb install
1611
- run: make

0 commit comments

Comments
 (0)