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

fix GitLab CI

Browse source
This commit is contained in:
Steffen Vogel 2017-05-14 10:32:57 +02:00
parent 4bffe387a9
commit e2ec8fdd17
2 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitlab-ci.yml
View file

@ -24,7 +24,6 @@ docker-dev:
# - docker login -u $DOCKER_USER -p $DOCKER_PASS -e $DOCKER_EMAIL $DOCKER_REGISTRY
script:
- make docker-dev
- make deploy-docker-dev
tags:
- shell
- linux

4
packaging/Makefile.inc
View file

@ -28,7 +28,6 @@ DEPLOY_USER ?= root
DEPLOY_HOST ?= villas.fein-aachen.org
DEPLOY_PATH ?= /var/www/villas/node
DOCKER_REGISTRY ?= docker.io
DOCKER_IMAGE ?= villas/node
deploy-docker-dev: DOCKER_IMAGE := $(DOCKER_IMAGE)-dev
@ -52,8 +51,7 @@ deploy-rpm:
ssh $(DEPLOY_USER)@$(DEPLOY_HOST) createrepo $(DEPLOY_PATH)/../packages
deploy-docker deploy-docker-dev:
docker tag $(DOCKER_IMAGE):$(GIT_BRANCH) $(DOCKER_REGISTRY)/$(DOCKER_IMAGE):$(GIT_BRANCH)
docker push $(DOCKER_REGISTRY)/$(DOCKER_IMAGE):$(GIT_BRANCH)
docker push $(DOCKER_IMAGE):$(GIT_BRANCH)
# Docker targets
run-docker-dev: docker-dev