Skip to content

Commit 1a49fbb

Browse files
authored
Move structure-check tools from Jenkinsfile to builder image (openshift#1889)
1 parent 9af113e commit 1a49fbb

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

Jenkinsfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,6 @@ pipeline {
8585
sh """#!/bin/bash -ex
8686
mkdir -p \$(dirname $GO_PROJECT) && ln -sf $WORKSPACE $GO_PROJECT
8787
88-
# TODO: Remove me.
89-
go get github.com/segmentio/terraform-docs
90-
go get github.com/s-urbaniak/terraform-examples
91-
go get github.com/bronze1man/yaml2json
92-
9388
cd $GO_PROJECT/
9489
make structure-check
9590
make bin/smoke

images/tectonic-builder/Dockerfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ FROM golang:1.8.3-stretch
2222
RUN go get -u github.com/golang/lint/golint
2323
RUN go get github.com/jstemmer/go-junit-report
2424

25+
### Tools used by 'make structure-check'
26+
RUN go get github.com/segmentio/terraform-docs
27+
RUN go get github.com/s-urbaniak/terraform-examples
28+
RUN go get github.com/bronze1man/yaml2json
29+
2530
### License parser
2631
RUN go get github.com/coreos/license-bill-of-materials
2732

0 commit comments

Comments
 (0)