mirror of
https://git.rwth-aachen.de/acs/public/villas/node/
synced 2025-03-09 00:00:00 +01:00
Merge branch 'ubuntu-fixes' into 'develop'
Ubuntu fixes See merge request !30
This commit is contained in:
commit
aac86c1c76
3 changed files with 8 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -267,6 +267,7 @@ int file_start(struct node *n)
|
|||
/* Get timestamp of first line */
|
||||
if (f->read_epoch_mode != FILE_EPOCH_ORIGINAL) {
|
||||
struct sample s;
|
||||
s.capacity = 0;
|
||||
|
||||
ret = sample_io_villas_fscan(f->read.handle->file, &s, NULL);
|
||||
if (ret < 0)
|
||||
|
@ -402,4 +403,4 @@ static struct plugin p = {
|
|||
};
|
||||
|
||||
REGISTER_PLUGIN(&p)
|
||||
LIST_INIT_STATIC(&p.node.instances)
|
||||
LIST_INIT_STATIC(&p.node.instances)
|
||||
|
|
|
@ -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):$(DOCKER_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
|
||||
|
|
Loading…
Add table
Reference in a new issue