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 Docker deployment

Browse source
This commit is contained in:
Steffen Vogel 2017-07-08 13:26:37 +02:00
parent aac86c1c76
commit 670511e1a0
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.gitlab-ci.yml
View file

@ -3,7 +3,8 @@ variables:
GIT_SUBMODULE_STRATEGY: recursive
PREFIX: /usr/
RSYNC_OPTS: --recursive --ignore-missing-args --chown $DEPLOY_USER:$DEPLOY_USER
DOCKER_IMAGE_DEV: villas/node-dev:${CI_COMMIT_REF_NAME}
DOCKER_TAG: ${CI_COMMIT_REF_SLUG}
DOCKER_IMAGE_DEV: villas/node-dev
stages:
- prepare
@ -22,10 +23,8 @@ before_script:
# Build docker image which is used to build & test VILLASnode
docker-dev:
stage: prepare
before_script:
# - docker login -u $DOCKER_USER -p $DOCKER_PASS -e $DOCKER_EMAIL $DOCKER_REGISTRY
script:
- make docker-dev DOCKER_TAG=${CI_COMMIT_REF_NAME}
- make docker-dev
tags:
- shell
- linux
@ -42,7 +41,7 @@ build:source:
name: "${CI_PROJECT_NAME}-${CI_BUILD_REF}"
paths:
- build/release/
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -54,7 +53,7 @@ build:docs:
- build/release/doc/
script:
- make doc
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -71,7 +70,7 @@ build:packages:
paths:
- build/release/packaging/*.tar.gz
- build/release/packaging/rpm/RPMS/
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -91,7 +90,7 @@ test:coverage:
- build/release-coverage/coverage/
- build/release-coverage/coverage.txt
- build/release-coverage/coverage.xml
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
coverage: '/lines: (\d+\.\d+\%)/'
tags:
- docker
@ -102,7 +101,7 @@ test:unit:
- build:source
script:
- make run-unit-tests
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -117,7 +116,7 @@ test:integration:
when: always
paths:
- build/release/tests/integration/
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -130,7 +129,7 @@ test:valgrind:
dependencies:
- build:source
allow_failure: true
image: $DOCKER_IMAGE_DEV
image: $DOCKER_IMAGE_DEV:$DOCKER_TAG
tags:
- docker
@ -169,19 +168,12 @@ deploy:packages:
# Stage: docker
##############################################################################
deploy:docker-dev:
stage: docker
script:
- make deploy-docker-dev
tags:
- shell
- linux
deploy:docker:
stage: docker
script:
- make docker
- make deploy-docker
- make deploy-docker-dev
dependencies:
- build:packages
tags:

9
packaging/Makefile.inc
View file

@ -28,7 +28,9 @@ DEPLOY_USER ?= acs
DEPLOY_HOST ?= villas.fein-aachen.org
DEPLOY_PATH ?= /var/www/villas/node
DOCKER_IMAGE ?= villas/node
DOCKER_IMAGE ?= villas/node
DOCKER_IMAGE_DEV ?= villas/node-dev
DOCKER_TAG ?= $(GIT_BRANCH)
deploy-docker-dev: DOCKER_IMAGE := $(DOCKER_IMAGE)-dev
@ -51,9 +53,12 @@ deploy-rpm:
rsync -a --progress $(RPMDIR)/RPMS/ $(DEPLOY_USER)@$(DEPLOY_HOST):$(DEPLOY_PATH)/../packages/
ssh $(DEPLOY_USER)@$(DEPLOY_HOST) createrepo $(DEPLOY_PATH)/../packages
deploy-docker deploy-docker-dev:
deploy-docker:
docker push $(DOCKER_IMAGE):$(DOCKER_TAG)
deploy-docker-dev:
docker push $(DOCKER_IMAGE_DEV):$(DOCKER_TAG)
# Docker targets
run-docker-dev: docker-dev
docker run -it -p 80:80 -p 443:443 -p 1234:1234 -p 12000:12000/udp -p 12001:12001/udp --privileged --security-opt seccomp:unconfined -v "$(SRCDIR):/villas" $(DOCKER_IMAGE)-dev:$(GIT_BRANCH)