cloudkeeper-one 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2addc69f939c5497397accddbf6900526a21e402
-  data.tar.gz: 7f1d72b372c871774198b73320914b76f3b37008
+  metadata.gz: 92aa8221e36dd33e28b815f3a464a1460ffe2a28
+  data.tar.gz: b1ea8271f82491978a0fac21c460339820ae97f7
 SHA512:
-  metadata.gz: 4e49c53da9aed9a46713c1cc89195a16c7005424a1cfc4816d12285aca4f59e1290ba8477e01a30a4c50a138315f8de21f5200087b966127d170f6c1e904e19e
-  data.tar.gz: e92811e8d5d75f193b7d896c9ea7f4f04d2f40216b93f7c190d30e3e724da03ad13747f0532702334c0e92572208b2cf12963fbc1ce5a674e681aad2731d5d11
+  metadata.gz: 5444b941f1256ee04f66de3bae0e3c41bbf88972e5a285cb668597c7ce8fd487401eb5d254352ffa1f1ed46d014e458c83ec248cd31727cc0bcd44e4a5bafb0a
+  data.tar.gz: 2fab4ba1b21ddf5d6f35396458821fd69c330de012042e136ada11167df1f7b1722c14141c433e81e5637f56b495a52b39cdb3cbfddd1c7b8ff437e98bdcac35

data/.circleci/config.yml

@@ -0,0 +1,36 @@
+version: 2
+jobs:
+  build:
+    branches:
+      only:
+        - master
+    docker:
+      - image: docker:stable
+    working_directory: /root/cloudkeeper-one
+    steps:
+      - run: apk add --no-cache git openssh
+      - checkout
+      - setup_remote_docker
+      - run: |
+          TAG=${CIRCLE_BRANCH}
+          BRANCH=${CIRCLE_BRANCH}
+          VERSION=">= 0"
+
+          if [ "${TAG}" == "master" ]; then
+            TAG=latest
+          fi
+
+          if [ -n "${CIRCLE_TAG}" ]; then
+            TAG=${CIRCLE_TAG#v}
+            BRANCH=${TAG/%.*/.x}
+            VERSION=${TAG}
+          fi
+
+          docker build --build-arg branch=$BRANCH --build-arg version="$VERSION" -t cloudkeeper/cloudkeeper-one:$TAG .
+          docker login -u $DOCKER_USER -p $DOCKER_PASS
+          docker push cloudkeeper/cloudkeeper-one:$TAG
+deployment:
+  fake_deploy_for_cci2:
+    tag: /v.*/
+    commands:
+      - echo "make tags run in 2.0"

data/Dockerfile

@@ -0,0 +1,40 @@
+FROM ubuntu:16.04
+
+ARG branch=master
+ARG version
+
+ENV name="cloudkeeper-one" \
+    username="cloudkeeper"
+ENV spoolDir="/var/spool/${username}"
+ENV applDir="${spoolDir}/appliances" \
+    logDir="/var/log/${username}"
+
+LABEL application=${name} \
+      description="A tool for synchronizing appliances between cloudkeeper and OpenNebula" \
+      maintainer="kimle@cesnet.cz" \
+      version=${version} \
+      branch=${branch}
+
+SHELL ["/bin/bash", "-c"]
+
+# update + dependencies
+RUN apt-get update && \
+    apt-get --assume-yes upgrade && \
+    apt-get --assume-yes install ruby ruby-dev zlib1g-dev gcc patch make
+
+# cloudkeeper-one
+RUN gem install ${name} -v "${version}" --no-document
+
+# env
+RUN useradd --system --shell /bin/false --home ${spoolDir} --create-home ${username} && \
+    usermod -L ${username} && \
+    mkdir -p ${applDir} ${logDir} && \
+    chown -R ${username}:${username} ${spoolDir} ${logDir}
+
+VOLUME ${applDir}
+
+EXPOSE 50051
+
+USER ${username}
+
+ENTRYPOINT ["cloudkeeper-one"]

data/cloudkeeper-one.gemspec

@@ -41,7 +41,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'pry', '~> 0.10'
   spec.add_development_dependency 'pry-byebug', '~> 3.4'
   spec.add_development_dependency 'vcr', '~> 3.0'
-  spec.add_development_dependency 'webmock', '~> 2.1'
+  spec.add_development_dependency 'webmock', '~> 3.0'
   spec.add_development_dependency 'grpc-tools', '~> 1.0'
 
   spec.add_runtime_dependency 'thor', '~> 0.19'

data/config/templates/template.erb

@@ -6,9 +6,9 @@ DESCRIPTION = "<%= "#{appliance.title} - #{appliance.description}" %>"
 DESCRIPTION = "<%= appliance.title %>"
 <% end %>
 
-MEMORY = "<%= appliance.ram || 1024 %>"
-CPU = "<%= appliance.core || 0.25 %>"
-VCPU = "<%= appliance.core || 1 %>"
+MEMORY = "<%= appliance.ram != 0 ? appliance.ram : 1024 %>"
+CPU = "<%= appliance.core != 0 ? appliance.core : 0.25 %>"
+VCPU = "<%= appliance.core != 0 ? appliance.core : 1 %>"
 
 OS = [
 ARCH = "<%= appliance.architecture || "x86_64" %>"

data/lib/cloudkeeper/one/version.rb

@@ -1,5 +1,5 @@
 module Cloudkeeper
   module One
-    VERSION = '1.2.0'.freeze
+    VERSION = '1.2.1'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudkeeper-one
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Michal Kimle
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-04 00:00:00.000000000 Z
+date: 2017-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: grpc-tools
   requirement: !ruby/object:Gem::Requirement
@@ -298,12 +298,14 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
+- Dockerfile
 - Gemfile
 - LICENSE.txt
 - README.md