cloudkeeper-one 1.2.1 → 1.2.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 92aa8221e36dd33e28b815f3a464a1460ffe2a28
4
- data.tar.gz: b1ea8271f82491978a0fac21c460339820ae97f7
3
+ metadata.gz: e196faafd597eb04749900d0018efa45acd9e3be
4
+ data.tar.gz: 88db4d7e7caa6ad5acf67aab4ccb6496b49bbee9
5
5
  SHA512:
6
- metadata.gz: 5444b941f1256ee04f66de3bae0e3c41bbf88972e5a285cb668597c7ce8fd487401eb5d254352ffa1f1ed46d014e458c83ec248cd31727cc0bcd44e4a5bafb0a
7
- data.tar.gz: 2fab4ba1b21ddf5d6f35396458821fd69c330de012042e136ada11167df1f7b1722c14141c433e81e5637f56b495a52b39cdb3cbfddd1c7b8ff437e98bdcac35
6
+ metadata.gz: 80b3135b1e03af1077dd9b096bfa9ced5939311451fb8905dc7c9ef87ce591404a2e7dc9cf02013e9e792e07d4937fee9c8b056ccb198048ddd5afac8afa31fa
7
+ data.tar.gz: 1272ad092a1608fe0d8f549f4c98661acb22aced948d3b2e514ddfb498310719973b3e8b46d00716d74b38085eaaac39eb99ea3cf603a7bcc415c1092f7ffca7
data/.circleci/config.yml CHANGED
@@ -2,8 +2,8 @@ version: 2
2
2
  jobs:
3
3
  build:
4
4
  branches:
5
- only:
6
- - master
5
+ ignore:
6
+ - /.*/
7
7
  docker:
8
8
  - image: docker:stable
9
9
  working_directory: /root/cloudkeeper-one
@@ -12,23 +12,20 @@ jobs:
12
12
  - checkout
13
13
  - setup_remote_docker
14
14
  - run: |
15
- TAG=${CIRCLE_BRANCH}
16
- BRANCH=${CIRCLE_BRANCH}
17
- VERSION=">= 0"
15
+ TAG=${CIRCLE_TAG#v}
16
+ BRANCH=${TAG/%.*/.x}
17
+ VERSION=${TAG}
18
+ LATEST=$(git tag --sort=-refname | head -n 1)
18
19
 
19
- if [ "${TAG}" == "master" ]; then
20
- TAG=latest
21
- fi
22
-
23
- if [ -n "${CIRCLE_TAG}" ]; then
24
- TAG=${CIRCLE_TAG#v}
25
- BRANCH=${TAG/%.*/.x}
26
- VERSION=${TAG}
27
- fi
20
+ docker login -u $DOCKER_USER -p $DOCKER_PASS
28
21
 
29
22
  docker build --build-arg branch=$BRANCH --build-arg version="$VERSION" -t cloudkeeper/cloudkeeper-one:$TAG .
30
- docker login -u $DOCKER_USER -p $DOCKER_PASS
31
23
  docker push cloudkeeper/cloudkeeper-one:$TAG
24
+
25
+ if [ "$LATEST" == "$CIRCLE_TAG" ]; then
26
+ docker tag cloudkeeper/cloudkeeper-one:$TAG cloudkeeper/cloudkeeper-one:latest
27
+ docker push cloudkeeper/cloudkeeper-one:latest
28
+ fi
32
29
  deployment:
33
30
  fake_deploy_for_cci2:
34
31
  tag: /v.*/
data/README.md CHANGED
@@ -1,10 +1,11 @@
1
1
  # cloudkeeper-one
2
2
  OpenNebula backend for [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper)
3
3
 
4
- [![Build Status](https://secure.travis-ci.org/the-cloudkeeper-project/cloudkeeper-one.png)](http://travis-ci.org/the-cloudkeeper-project/cloudkeeper-one)
5
- [![Dependency Status](https://gemnasium.com/the-cloudkeeper-project/cloudkeeper-one.png)](https://gemnasium.com/the-cloudkeeper-project/cloudkeeper-one)
6
- [![Gem Version](https://fury-badge.herokuapp.com/rb/cloudkeeper-one.png)](https://badge.fury.io/rb/cloudkeeper-one)
7
- [![Code Climate](https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper-one.png)](https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper-one)
4
+ [![Travis](https://img.shields.io/travis/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](http://travis-ci.org/the-cloudkeeper-project/cloudkeeper-one)
5
+ [![Gemnasium](https://img.shields.io/gemnasium/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](https://gemnasium.com/the-cloudkeeper-project/cloudkeeper-one)
6
+ [![Gem](https://img.shields.io/gem/v/cloudkeeper-one.svg?style=flat-square)](https://rubygems.org/gems/cloudkeeper-one)
7
+ [![Code Climate](https://img.shields.io/codeclimate/github/the-cloudkeeper-project/cloudkeeper-one.svg?style=flat-square)](https://codeclimate.com/github/the-cloudkeeper-project/cloudkeeper-one)
8
+ [![DockerHub](https://img.shields.io/badge/docker-ready-blue.svg?style=flat-square)](https://hub.docker.com/r/cloudkeeper/cloudkeeper-one/)
8
9
 
9
10
  ## What does cloudkeeper-one do?
10
11
  cloudkeeper-one is able to manage [OpenNebula](https://opennebula.org/) cloud - upload, update and remove images and templates representing EGI AppDB appliances. cloudkeeper-one runs as a server listening for [gRPC](http://www.grpc.io/) communication usually from core [cloudkeeper](https://github.com/the-cloudkeeper-project/cloudkeeper) component.
@@ -48,7 +48,7 @@ Gem::Specification.new do |spec|
48
48
  spec.add_runtime_dependency 'yell', '~> 2.0'
49
49
  spec.add_runtime_dependency 'grpc', '~> 1.0'
50
50
  spec.add_runtime_dependency 'settingslogic', '~> 2.0'
51
- spec.add_runtime_dependency 'activesupport', '~> 4.0'
51
+ spec.add_runtime_dependency 'activesupport', '>= 4.0', '< 6.0'
52
52
  spec.add_runtime_dependency 'tilt', '~> 2.0'
53
53
  spec.add_runtime_dependency 'opennebula', '~> 5.2'
54
54
  spec.add_runtime_dependency 'chronic_duration', '~> 0.10'
@@ -11,6 +11,7 @@
11
11
  ### END INIT INFO
12
12
 
13
13
  run_dir="/var/run/cloudkeeper-one"
14
+ lock_dir="/var/lock/cloudkeeper-one"
14
15
  log_dir="/var/log/cloudkeeper-one"
15
16
  conf_dir="/etc/cloudkeeper-one"
16
17
 
@@ -34,6 +35,11 @@ get_pid() {
34
35
  cat "$pid_file"
35
36
  }
36
37
 
38
+ setup_dirs() {
39
+ mkdir -p "$run_dir" "$lock_dir"
40
+ chown "$user":"$user" "$run_dir" "$lock_dir"
41
+ }
42
+
37
43
  is_running() {
38
44
  [ -f "$pid_file" ] && ps `get_pid` > /dev/null 2>&1
39
45
  }
@@ -43,6 +49,7 @@ start() {
43
49
  echo "Already started"
44
50
  else
45
51
  echo "Starting $name ..."
52
+ setup_dirs
46
53
 
47
54
  cd "$run_dir"
48
55
  sudo -u "$user" $cmd >> "$stdout_log" 2>> "$stderr_log" &
@@ -1,5 +1,5 @@
1
1
  module Cloudkeeper
2
2
  module One
3
- VERSION = '1.2.1'.freeze
3
+ VERSION = '1.2.2'.freeze
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cloudkeeper-one
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.1
4
+ version: 1.2.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michal Kimle
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2017-04-18 00:00:00.000000000 Z
11
+ date: 2017-04-26 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -238,16 +238,22 @@ dependencies:
238
238
  name: activesupport
239
239
  requirement: !ruby/object:Gem::Requirement
240
240
  requirements:
241
- - - "~>"
241
+ - - ">="
242
242
  - !ruby/object:Gem::Version
243
243
  version: '4.0'
244
+ - - "<"
245
+ - !ruby/object:Gem::Version
246
+ version: '6.0'
244
247
  type: :runtime
245
248
  prerelease: false
246
249
  version_requirements: !ruby/object:Gem::Requirement
247
250
  requirements:
248
- - - "~>"
251
+ - - ">="
249
252
  - !ruby/object:Gem::Version
250
253
  version: '4.0'
254
+ - - "<"
255
+ - !ruby/object:Gem::Version
256
+ version: '6.0'
251
257
  - !ruby/object:Gem::Dependency
252
258
  name: tilt
253
259
  requirement: !ruby/object:Gem::Requirement