From c92f2ee84672206517a25a14de435b8c34260107 Mon Sep 17 00:00:00 2001 From: Georg Reinke Date: Fri, 7 Jul 2017 12:19:33 +0200 Subject: [PATCH] fix CI --- .gitlab-ci.yml | 2 +- Makefile | 4 ++-- packaging/Makefile.inc | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index dc3b335a6..adfd8dd2e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -25,7 +25,7 @@ docker-dev: before_script: # - docker login -u $DOCKER_USER -p $DOCKER_PASS -e $DOCKER_EMAIL $DOCKER_REGISTRY script: - - make docker-dev + - make docker-dev DOCKER_TAG=${CI_COMMIT_REF_NAME} tags: - shell - linux diff --git a/Makefile b/Makefile index 8e1a06356..597924451 100644 --- a/Makefile +++ b/Makefile @@ -96,8 +96,8 @@ ifdef CI VARIANT := $(VARIANT)-ci endif -GIT_REV := $(shell git rev-parse --short=7 HEAD) -GIT_BRANCH := $(shell git symbolic-ref --short HEAD) +GIT_REV := $(shell git rev-parse --short=7 HEAD) +GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD) # pkg-config dependencies PKGS = libconfig diff --git a/packaging/Makefile.inc b/packaging/Makefile.inc index 468ffae0f..6da6c5143 100644 --- a/packaging/Makefile.inc +++ b/packaging/Makefile.inc @@ -29,6 +29,7 @@ DEPLOY_HOST ?= villas.fein-aachen.org DEPLOY_PATH ?= /var/www/villas/node DOCKER_IMAGE ?= villas/node +DOCKER_TAG ?= $(GIT_BRANCH) deploy-docker-dev: DOCKER_IMAGE := $(DOCKER_IMAGE)-dev docker-dev: DOCKER_IMAGE := $(DOCKER_IMAGE)-dev @@ -51,7 +52,7 @@ deploy-rpm: ssh $(DEPLOY_USER)@$(DEPLOY_HOST) createrepo $(DEPLOY_PATH)/../packages deploy-docker deploy-docker-dev: - docker push $(DOCKER_IMAGE):$(GIT_BRANCH) + docker push $(DOCKER_IMAGE):$(DOCKER_TAG) # Docker targets run-docker-dev: docker-dev @@ -59,11 +60,11 @@ run-docker-dev: docker-dev docker-dev: docker pull fedora:25 - docker build -f Dockerfile.dev -t $(DOCKER_IMAGE):$(GIT_BRANCH) $(SRCDIR) + docker build -f Dockerfile.dev -t $(DOCKER_IMAGE):$(DOCKER_TAG) $(SRCDIR) docker: docker pull fedora:25 - docker build -f Dockerfile -t $(DOCKER_IMAGE):$(GIT_BRANCH) $(SRCDIR) + docker build -f Dockerfile -t $(DOCKER_IMAGE):$(DCOKER_TAG) $(SRCDIR) clean-packaging: rm -f $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM).tar.gz @@ -72,4 +73,4 @@ install-packaging: .PHONY: packaging install-packaging clean-packaging deploy deploy-dist deploy-rpm dist docker docker-dev run-docker-dev $(TAR_VILLAS) --include packaging/rpm/Makefile.inc \ No newline at end of file +-include packaging/rpm/Makefile.inc