diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b9edbfd..236b8e5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,6 @@ docker-gitlab: - apk add make - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY script: - - make docker/buildLatest - - make docker/buildTag + - make docker/build/latest + - make docker/build/tag - docker push registry.gitlab.com/hectorjsmith/fail2ban-prometheus-exporter diff --git a/Makefile b/Makefile index ed1f65d..f90f80e 100644 --- a/Makefile +++ b/Makefile @@ -29,8 +29,8 @@ build/docker: cd src/ && go build -o exporter \ -ldflags '-X main.version=$(shell git describe --tags) -X main.commit=${shell git rev-parse HEAD} -X "main.date=${shell date --rfc-3339=seconds}" -X main.builtBy=docker' exporter.go -docker/buildLatest: +docker/build/latest: docker build -t registry.gitlab.com/hectorjsmith/fail2ban-prometheus-exporter:latest . -docker/buildTag: +docker/build/tag: docker build -t registry.gitlab.com/hectorjsmith/fail2ban-prometheus-exporter:$(shell git describe --tags) .