vagrant-vmck 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e55bcdcc4ce55236626c698fbd3cf09d0891494c059623ecf8586c5307cf9e5
-  data.tar.gz: 7fe315f91f8e1e539c0364e1190885bf6a74bb31808362c8448dd8c26920e556
+  metadata.gz: a4c8c0d2a2581947bfff1f4220f651982edaeb1d43b0137519140b4a1bac3762
+  data.tar.gz: e7760b4a7171e6383bfffbe51a9af1c2bed8292fbd77a6704f11f6588f263d79
 SHA512:
-  metadata.gz: f13a49c9205d4dd6cdda05c90a36a0115221ae423f7f14b927ca06feb5a1a784514eaec07e0c456433c7d97d7fcc737a0eabb521ab66a1efdb07cb7c282c2cb4
-  data.tar.gz: cca2f57596bc981aa8e3ea9768c9f99b1f4d3194ff4653bb00791169f214cfc5a0c46532da0bc61708d54096abda123e762b51504f181d9be58b7e284df83982
+  metadata.gz: 3c6b520f270bcff9c09807977a33adc53b2d204ef5b588de921f9301ac004a321bc8bc6e8b5c7a565d9dce771d3fbb1f07882fab5ec24c29bcef393a354cc5a9
+  data.tar.gz: effff2148652e0b1dc70c6710d1cee2ccd456239dbe944c75566a2b31fb76309349c4585210666d7eb6ae649023003e022064a7612dd35512cecf0348574ea82

data/.drone.yml

@@ -0,0 +1,96 @@
+kind: pipeline
+name: test
+
+steps:
+- name: docker build
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run
+  commands:
+  - sleep 1; until docker version; do sleep 1; done
+  - docker build . --tag vagrant-vmck
+
+- name: list plugins
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run
+  commands:
+  - apk update -q && apk add -q grep
+  - docker run vagrant-vmck vagrant --version
+  - docker run vagrant-vmck vagrant plugin list
+  - docker run vagrant-vmck vagrant plugin list | grep -q vagrant-vmck
+
+- name: launch example VM
+  image: docker:dind
+  volumes:
+  - name: dockersock
+    path: /var/run
+  commands:
+  - export VMCK_URL=http://$VMCK_IP:$VMCK_PORT
+  - docker run -e VMCK_URL=$VMCK_URL vagrant-vmck bash /src/run-test.sh
+
+services:
+- name: docker daemon in docker
+  image: docker:dind
+  privileged: true
+  volumes:
+  - name: dockersock
+    path: /var/run
+
+volumes:
+- name: dockersock
+  temp: {}
+
+---
+kind: pipeline
+name: publish
+
+trigger:
+  status:
+  - success
+  event:
+  - push
+  - tag
+
+depends_on:
+- test
+
+steps:
+- name: docker push branch ${DRONE_COMMIT_BRANCH}
+  image: plugins/docker
+  settings:
+    repo: vmck/vagrant-vmck
+    tags: ${DRONE_COMMIT_BRANCH}
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+  when:
+    event:
+    - push
+
+- name: docker push autotag + latest
+  image: plugins/docker
+  settings:
+    repo: vmck/vagrant-vmck
+    auto_tag: true
+    username:
+      from_secret: docker_username
+    password:
+      from_secret: docker_password
+
+---
+kind: secret
+name: docker_username
+get:
+  path: liquid/ci/drone.docker
+  name: username
+
+---
+kind: secret
+name: docker_password
+get:
+  path: liquid/ci/drone.docker
+  name: password

data/Dockerfile

@@ -1,13 +1,24 @@
-FROM debian:stretch
+FROM alpine:3.10.1
 
-RUN set -e \
- && apt-get update \
- && apt-get install -y procps curl rsync kmod ssh \
- && apt-get clean && rm -rf /var/lib/apt/lists/*
+RUN apk add ruby ruby-dev ruby-bundler ruby-json rsync gcc g++ make git libc-dev openssh bash
 
-RUN set -e \
- && curl -O https://releases.hashicorp.com/vagrant/2.2.4/vagrant_2.2.4_x86_64.deb \
- && dpkg -i vagrant_2.2.4_x86_64.deb \
- && rm vagrant_2.2.4_x86_64.deb
+ENV PATH=$PATH:/vagrant/exec
+
+RUN git clone https://github.com/hashicorp/vagrant.git \
+ && cd vagrant \
+ && git checkout v2.2.4 \
+ && bundle install \
+ && bundle --binstubs exec \
+ && vagrant --version \
+ && vagrant plugin install vagrant-env
 
-RUN vagrant plugin install vagrant-vmck
+RUN mkdir /src
+WORKDIR /src
+ADD . .
+
+RUN set -e \
+ && gem build vagrant-vmck.gemspec \
+ && vagrant plugin install vagrant-vmck-*.gem \
+ && gem_dir="$(ls -d /root/.vagrant.d/gems/*/gems/vagrant-vmck-*)" \
+ && rm -rf "$gem_dir" \
+ && ln -s /src "$gem_dir"

data/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 
 group :development do
-  gem 'vagrant', git: 'https://github.com/hashicorp/vagrant.git'
+  gem 'vagrant', tag: 'v2.2.4', git: 'https://github.com/hashicorp/vagrant.git'
 end
 
 group :plugins do

data/Readme.md

@@ -16,16 +16,22 @@
 
 ## Usage
 
-See `example_box/Vagrantfile` for an example configuration.
+See `examples/box/Vagrantfile` for an example configuration.
 
 ```shell
 $ vagrant up --provider=vmck
 ```
 
+The vmck provider is also packaged as a docker image:
+
+```shell
+./examples/docker.sh --dev --env VMCK_URL=http://10.66.60.1:9995
+```
+
 ## Release
 1. Update `lib/vagrant-vmck/version.rb` and commit
 2. `git tag v1.2.3; git push --tags`
-3. `gem release`
+3. `gem install gem-release; gem release`
 4. `docker build . --tag vmck/vagrant-vmck:1.2.3 --no-cache`
 5. `docker build . --tag vmck/vagrant-vmck` (should reuse the previous build)
 6. `docker push vmck/vagrant-vmck`

data/examples/docker.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -e
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"/..
+
+image=vmck/vagrant-vmck:latest
+options=(--rm --interactive --tty)
+
+while [[ $# -gt 0 ]]; do
+  arg=$1
+  shift
+  case "$arg" in
+    "--dev")
+      options+=('--volume' "$(pwd):/src")
+      ;;
+    "--env")
+      options+=('--env' "$1")
+      shift
+      ;;
+    *)
+      echo "Unknown option $arg" >&2
+      exit 1
+  esac
+done
+
+set -x
+exec docker run ${options[@]} $image

data/lib/vagrant-vmck/action/create.rb

@@ -18,6 +18,8 @@ module VagrantPlugins
           options = {
             'cpus': env[:machine].provider_config.cpus,
             'memory': env[:machine].provider_config.memory,
+            'image_path': env[:machine].provider_config.image_path,
+            'storage': env[:machine].provider_config.storage,
           }
           id = client.create(options)['id'].to_s
           env[:machine].id = id

data/lib/vagrant-vmck/config.rb

@@ -5,12 +5,16 @@ module VagrantPlugins
       attr_accessor :private_key_path
       attr_accessor :memory
       attr_accessor :cpus
+      attr_accessor :image_path
+      attr_accessor :storage
 
       def initialize
         @vmck_url = UNSET_VALUE
         @private_key_path = UNSET_VALUE
         @memory = UNSET_VALUE
         @cpus = UNSET_VALUE
+        @image_path = UNSET_VALUE
+        @storage = UNSET_VALUE
       end
 
       def finalize!
@@ -18,6 +22,8 @@ module VagrantPlugins
         @private_key_path = nil if @private_key_path == UNSET_VALUE
         @memory = 512 if @memory == UNSET_VALUE
         @cpus = 1 if @cpus == UNSET_VALUE
+        @image_path = 'imgbuild-master.qcow2.tar.gz' if @image_path == UNSET_VALUE
+        @storage = nil if @storage == UNSET_VALUE
       end
 
     end

data/lib/vagrant-vmck/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Vmck
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

data/run-test.sh

@@ -0,0 +1,19 @@
+#!/bin/bash -ex
+
+cd "$( dirname "${BASH_SOURCE[0]}" )"
+cd examples/box
+
+set +e
+vagrant up --provider=vmck
+ret=$?
+
+vagrant ssh <<EOF
+set -x
+uname -a
+w
+df -h
+free -h
+EOF
+
+vagrant destroy -f
+exit $ret

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vmck
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Alex Morega
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-24 00:00:00.000000000 Z
+date: 2019-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -87,12 +87,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".drone.yml"
 - ".gitignore"
 - Dockerfile
 - Gemfile
 - LICENSE.txt
 - Readme.md
-- example_box/Vagrantfile
+- examples/box/Vagrantfile
+- examples/docker.sh
 - lib/vagrant-vmck.rb
 - lib/vagrant-vmck/action.rb
 - lib/vagrant-vmck/action/connect_vmck.rb
@@ -104,6 +106,7 @@ files:
 - lib/vagrant-vmck/plugin.rb
 - lib/vagrant-vmck/provider.rb
 - lib/vagrant-vmck/version.rb
+- run-test.sh
 - vagrant-vmck.gemspec
 homepage: https://github.com/mgax/vagrant-vmck
 licenses:

data/example_box/Vagrantfile

@@ -1,16 +0,0 @@
-# -*- mode: ruby -*-
-# vi: set ft=ruby :
-
-Vagrant.configure("2") do |config|
-
-  config.vm.box = "base"
-
-  config.vm.provision 'hello', type: 'shell', inline: 'echo hello world'
-
-  config.vm.provider :vmck do |provider|
-    provider.vmck_url = 'http://127.0.0.1:8000'
-    provider.memory = 1024
-    provider.cpus = 2
-  end
-
-end