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 7
7
script :
8
8
- echo "Nginx Prometheus Exporter - commit:${TRAVIS_COMMIT}"
9
9
- make test
10
- - make container
10
+ - make container DOCKER_BUILDKIT=0;
11
11
before_install :
12
12
- echo "PR Slug:${TRAVIS_PULL_REQUEST_SLUG}"
13
13
- if [[ "${TRAVIS_PULL_REQUEST_SLUG}" == "nginxinc/nginx-prometheus-exporter" || "${TRAVIS_PULL_REQUEST}" == "false" ]]; then
Original file line number Diff line number Diff line change 1
1
VERSION = 0.5.0
2
- PREFIX = nginx/nginx-prometheus-exporter
3
2
TAG = $(VERSION )
3
+ PREFIX = nginx/nginx-prometheus-exporter
4
+
5
+ DOCKERFILEPATH = build
6
+ DOCKERFILE = Dockerfile
7
+
4
8
GIT_COMMIT = $(shell git rev-parse --short HEAD)
5
9
6
10
BUILD_DIR = build_output
7
11
8
- nginx-prometheus-exporter : test
12
+ export DOCKER_BUILDKIT = 1
13
+
14
+ nginx-prometheus-exporter :
9
15
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
10
16
11
17
lint :
15
21
GO111MODULE=on go test -mod=vendor ./...
16
22
17
23
container :
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 ) .
19
25
20
26
push : container
21
27
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