Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

fix CI

Browse source
This commit is contained in:
Georg Reinke 2017-07-07 12:19:33 +02:00
parent 7f8c2add2e
commit c92f2ee846
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci.yml
View file

@ -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

4
Makefile
View file

@ -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

9
packaging/Makefile.inc
View file

@ -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
-include packaging/rpm/Makefile.inc