File tree Expand file tree Collapse file tree 4 files changed +17
-4
lines changed Expand file tree Collapse file tree 4 files changed +17
-4
lines changed Original file line number Diff line number Diff line change 77script :
88- echo "Nginx Prometheus Exporter - commit:${TRAVIS_COMMIT}"
99- make test
10- - make container
10+ - make container DOCKER_BUILDKIT=0;
1111before_install :
1212- echo "PR Slug:${TRAVIS_PULL_REQUEST_SLUG}"
1313- if [[ "${TRAVIS_PULL_REQUEST_SLUG}" == "nginxinc/nginx-prometheus-exporter" || "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
Original file line number Diff line number Diff line change 11VERSION = 0.5.0
2- PREFIX = nginx/nginx-prometheus-exporter
32TAG = $(VERSION )
3+ PREFIX = nginx/nginx-prometheus-exporter
4+
5+ DOCKERFILEPATH = build
6+ DOCKERFILE = Dockerfile
7+
48GIT_COMMIT = $(shell git rev-parse --short HEAD)
59
610BUILD_DIR = build_output
711
8- nginx-prometheus-exporter : test
12+ export DOCKER_BUILDKIT = 1
13+
14+ nginx-prometheus-exporter :
915 GO111MODULE=on CGO_ENABLED=0 go build -mod=vendor -installsuffix cgo -ldflags " -X main.version=$( VERSION) -X main.gitCommit=$( GIT_COMMIT) " -o nginx-prometheus-exporter
1016
1117lint :
1521 GO111MODULE=on go test -mod=vendor ./...
1622
1723container :
18- docker build --build-arg VERSION=$(VERSION ) --build-arg GIT_COMMIT=$(GIT_COMMIT ) -t $(PREFIX ) :$(TAG ) .
24+ docker build --build-arg VERSION=$(VERSION ) --build-arg GIT_COMMIT=$(GIT_COMMIT ) -f $( DOCKERFILEPATH ) / $( DOCKERFILE ) - t $(PREFIX ) :$(TAG ) .
1925
2026push : container
2127 docker push $(PREFIX ) :$(TAG )
File renamed without changes.
Original file line number Diff line number Diff line change 1+ node {
2+ git(
3+ url : " ${ libsLocation} " ,
4+ credentialsId : " ${ githubCreds} "
5+ )
6+ load ' nginx-prometheus-exporter/Jenkinsfile'
7+ }
You can’t perform that action at this time.
0 commit comments