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

renamed Docker image to ‚villas-node‘ (#79)

Browse source
This commit is contained in:
Steffen Vogel 2017-04-06 20:29:43 +02:00
parent bfad9ff397
commit 3daf7cfec2
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
.gitlab-ci.yml
View file

@ -20,9 +20,9 @@ docker-dev:
- docker info
script:
- docker pull fedora:latest
- make docker-dev
- docker tag -f villas-dev $DOCKER_REGISTRY/villas-dev:latest
- docker push $DOCKER_REGISTRY/villas-dev:latest
- docker build -f Dockerfile.dev -t villas-node-dev .
- docker tag -f villas-node-dev $DOCKER_REGISTRY/villas-node-dev:latest
- docker push $DOCKER_REGISTRY/villas-node-dev:latest
tags:
- shell
- linux
@ -39,7 +39,7 @@ build:
name: "${CI_PROJECT_NAME}-${CI_BUILD_REF}"
paths:
- build/release/
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
tags:
- docker
@ -51,7 +51,7 @@ docs:
- build/release/doc/
script:
- make doc
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
tags:
- docker
@ -71,7 +71,7 @@ packages:
paths:
- build/release/packaging/*.tar.gz
- build/release/packaging/rpm/RPMS/
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
tags:
- docker
@ -89,7 +89,7 @@ coverage:
- build/release-coverage/coverage/
- build/release-coverage/coverage.txt
- build/release-coverage/coverage.xml
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
coverage: '/lines: (\d+\.\d+\%)/'
tags:
- docker
@ -100,7 +100,7 @@ unit:
- build
script:
- make run-unit-tests
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
tags:
- docker
@ -117,7 +117,7 @@ integration:
when: always
paths:
- build/release/tests/integration/
image: $DOCKER_REGISTRY/villas-dev
image: $DOCKER_REGISTRY/villas-node-dev
tags:
- docker

6
packaging/Makefile.inc
View file

@ -24,13 +24,13 @@ deploy-rpm:
# Docker targets
run-docker-dev:
docker run -it -p 80:80 -p 443:443 -p 1234:1234 --privileged --security-opt seccomp:unconfined -v $(PWD):/villas villas-dev
docker run -it -p 80:80 -p 443:443 -p 1234:1234 --privileged --security-opt seccomp:unconfined -v $(PWD):/villas villas-node-dev
docker-dev:
docker build -f Dockerfile.dev -t villas-dev $(SRCDIR)
docker build -f Dockerfile.dev -t villas-node-dev $(SRCDIR)
docker:
docker build -f Dockerfile -t villas $(SRCDIR)
docker build -f Dockerfile -t villas-node $(SRCDIR)
clean-packaging:
rm -f $(BUILDDIR)/packaging/villas-node-$(VERSION_NUM).tar.gz