phoebo 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c3136a194cda19dab404d522973deb0b65d37f
-  data.tar.gz: be0bcb5c4fcec2576484e77c7df208f80da654ad
+  metadata.gz: a5b6eb6663c7c1b090842e76982640f580136abc
+  data.tar.gz: 3207635c0d4257839833a21b99985acb3c4f7d85
 SHA512:
-  metadata.gz: c4fbad8e3f99763720f8c92dc653b7e23a5153d303060607de54b9549b7b4cc188613ad0ccc6cbd15fae73316e6c41d3937877afa06cf5bd7119bef30844f06b
-  data.tar.gz: f34afee13c7bf5eb1d41d45e060ffad5b113317a136de1460449347906368bd5a734293de105121cc40d12dd458c2a3fc7b909a430e9be7786733cf1a4ae72dd
+  metadata.gz: bf8cf82e12278cb68316470dfb5a824088ce42583b6d2e73549b561ab023b2183f557c700369712aad62bd7cff48523db2645d03721990fd307f677c9e8a8d8a
+  data.tar.gz: 903c813e16d33624724b4571e5de60a88ed91ebbdadbc4facd8d3c31958ba1b50ba2670517e44d27bab63b004795c6ee28cb184442d986603bac4e2de6eec874

data/README.md

@@ -1,4 +1,45 @@
-# Phoebo
+# Image Builder
+
+This project is a component of Phoebo CI responsible for building Docker images.
+
+## Local installation
+
+### Requirements
+
+- Docker
+
+### Install as Gem
+
+```bash
+# Necessary libraries for working SSH authorization for Git (Rugged)
+apt-get install cmake pkg-config libssh2-1-dev
+
+# Install Rugged with previously installed system libraries
+gem install rugged -- --use-system-libraries
+
+# Install Phoebo Image Builder
+gem install phoebo
+```
+
+## Use inside of Docker
+
+### With shared Docker
+
+```bash
+docker run \
+  -v /var/run/docker.sock:/tmp/docker.sock
+  -e NO_DIND=1 -e DOCKER_URL=unix:///tmp/docker.sock \
+  phoebo/image-builder:latest \
+  phoebo --help
+```
+
+### DinD
+
+```bash
+docker run --privileged \
+  phoebo/image-builder:latest \
+  phoebo --help
+```
 
 ## DSL example
 
@@ -6,7 +47,7 @@
 Phoebo.configure(1) {
 
   # Create image based on Apache + mod_php
-  image('phoebo/nette-example', 'phoebo/simple-apache-php') {
+  image('phoebo/nette-example', from: 'phoebo/simple-apache-php') {
     # Copy all application data
     add('.', '/app/')
 
@@ -17,11 +58,13 @@ Phoebo.configure(1) {
     run('ln', '-s', '/app/www', '/var/www')
   }
 
-  # Deploy image and keep it runing (default CMD: apache)
-  task('deploy', 'phoebo/nette-example')
-
-  # Run tests on image
-  task('test', 'phoebo/nette-example', '/app/bin/tester', '/app/tests')
+  # Deploy image and start web server (default CMD: apache)
+  service(’Web’,
+    image: ’phoebo/nette-example’,
+    ports: [
+      { tcp: 80 }
+    ]
+  )
 }
 ~~~
 
@@ -93,3 +136,7 @@ Other than that payload contains list of tasks with arguments and image on which
    ]
 }
 ~~~
+
+## Contact
+
+Project is developed by Adam Staněk <adam.stanek@v3net.cz>

data/lib/phoebo/config/image.rb

@@ -13,7 +13,7 @@ module Phoebo
 
           # image('my-image', from: 'base-image')
           if options[:from]
-            @from = [ :image, options[:from] ]
+            @from = [ :base_image, options[:from] ]
             raise Phoebo::SyntaxError.new('You can only use from: or from_dockerfile: directive as a base for your images.') if options[:from_dockerfile]
 
           # image('my-image', from_dockerfile: 'Dockerfile')

data/lib/phoebo/version.rb

@@ -1,3 +1,3 @@
 module Phoebo
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phoebo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Adam Staněk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-21 00:00:00.000000000 Z
+date: 2015-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize