Skip to content
This repository was archived by the owner on Dec 21, 2017. It is now read-only.

Commit 9d1bf67

Browse files
Erik Hollensbevishal-j
Erik Hollensbe
authored andcommitted
Storage fixes (#96)
* Dockerfile and Makefile to ease the build/run cycle on servers that have docker installed Signed-off-by: Erik Hollensbe <[email protected]> * Storage Policy: correct invalid data fields for NFS Signed-off-by: Erik Hollensbe <[email protected]>
1 parent 0276e8e commit 9d1bf67

File tree

4 files changed

+33
-8
lines changed

4 files changed

+33
-8
lines changed

Dockerfile.build

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
FROM node
2+
3+
RUN npm install -g bower
4+
RUN npm install -g gulp
5+
6+
WORKDIR /contiv-ui
7+
8+
CMD gulp build

Makefile

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
build:
2+
@docker run -it -u $$(id -u):$$(id -g) --rm -v ${PWD}:/contiv-ui contiv-ui-builder || \
3+
echo "If you have not run the build task before, please run `make build-builder` first. "
4+
5+
dev-build:
6+
@docker run -it -u $$(id -u):$$(id -g) --rm -v ${PWD}:/contiv-ui contiv-ui-builder gulp dev-build || \
7+
echo "If you have not run the build task before, please run `make build-builder` first. "
8+
9+
build-builder:
10+
docker build -t contiv-ui-builder -f Dockerfile.build .
11+
12+
build-nginx:
13+
docker build -t contiv-ui-nginx .
14+
15+
run: build build-nginx
16+
@docker rm -f contiv-ui-nginx || :
17+
docker run --name contiv-ui-nginx --net host -itd contiv-ui-nginx

app/bundle.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/storage_policies/storagepolicycreatectrl.js

+6-6
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ angular.module('contiv.storagepolicies')
6363
"pool": "rbd"
6464
},
6565
"create": {
66-
"size": "10MB",
67-
"filesystem": "ext4"
66+
"size": "0",
67+
"filesystem": ""
6868
},
6969
"runtime": {
7070
"snapshots": true,
@@ -73,10 +73,10 @@ angular.module('contiv.storagepolicies')
7373
"keep": 20
7474
},
7575
"rate-limit": {
76-
"write-iops": 1000,
77-
"read-iops": 1000,
78-
"write-bps": 100000000,
79-
"read-bps": 100000000
76+
"write-iops": 0,
77+
"read-iops": 0,
78+
"write-bps": 0,
79+
"read-bps": 0
8080
}
8181
},
8282
"filesystems": {}

0 commit comments

Comments
 (0)