vagrant-docker-compose 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2094b1904e3f3ffc9fb8082535a07fd879ca225acd2675b10f34f2bd3be01c6
-  data.tar.gz: 64fb9993e20906189927735d7d8a27d66d3a98a63910a4e4c2709322f121d155
+  metadata.gz: 6bc10cdbca67bacd396cc2944b0fe8bd40ed594125f22f40590f8c5681b759a4
+  data.tar.gz: 68a1c99f8cf0aa48f196cdc5f28b99e91ae4f926cdabaaaace4430533da36549
 SHA512:
-  metadata.gz: dbb9e8572f25ebe7688817b34120ad9209ea853a65fa0967ee4f838d2cd3e692bacd952a41bc506dc7cc3d95b0515019793d00444942fb9664663361fd719d23
-  data.tar.gz: ed6a09c25f4168c10767bb13904fa32e9e1caeedabf3ad8ed2b75fef5dad9237b9e9735432d2a91c470eb0def94a3511408308f9a8fe5133bb6ffbcd48fc4a59
+  metadata.gz: 64b35185ae5274fee4b55833c419a23397c242c5f6a830973192daa8ba2d737127887cca6b1548415f1d549d75aa66a29127bc8541ef44e8c2c5986d0212ead6
+  data.tar.gz: 2ac9c487cfc1c52423518c3831b864b87189710dd4f6e048d387576168b785ea91131075cd55c351c39e4d61895217ab27bd7e0288d8d9607df0b135efc8f25f

data/.circleci/config.yml

@@ -0,0 +1,59 @@
+version: 2.1
+
+executors:
+  ubuntu1404:
+    machine:
+      image: circleci/classic:latest
+  ubuntu1604:
+    machine:
+      image: ubuntu-1604:201903-01
+
+commands:
+  docker_build_debian10:
+    steps:
+      - run: docker build -t vagrant:debian10 https://github.com/leighmcculloch/vagrant-docker-image.git#:debian10
+      - run: docker tag vagrant:debian10 vagrant:latest
+  docker_build_centos7:
+    steps:
+      - run: docker build -t vagrant:centos7 https://github.com/leighmcculloch/vagrant-docker-image.git#:centos7
+      - run: docker tag vagrant:centos7 vagrant:latest
+  test:
+    steps:
+      - run: bundle install --path vendor/bundle
+      - run: bundle exec vagrant up
+      - run: bundle exec vagrant ssh -c 'docker-compose --version'
+
+jobs:
+  host_ubuntu1404_guest_debian10:
+    executor: ubuntu1404
+    steps:
+      - docker_build_debian10
+      - checkout
+      - test
+  host_ubuntu1404_guest_centos7:
+    executor: ubuntu1404
+    steps:
+      - docker_build_centos7
+      - checkout
+      - test
+  host_ubuntu1604_guest_debian10:
+    executor: ubuntu1604
+    steps:
+      - docker_build_debian10
+      - checkout
+      - test
+  host_ubuntu1604_guest_centos7:
+    executor: ubuntu1604
+    steps:
+      - docker_build_centos7
+      - checkout
+      - test
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - host_ubuntu1404_guest_debian10
+      - host_ubuntu1404_guest_centos7
+      - host_ubuntu1604_guest_debian10
+      - host_ubuntu1604_guest_centos7

data/CONTRIBUTING.md

@@ -0,0 +1,18 @@
+# Contributing Guidelines
+
+Contributions are much appreciated and welcome!
+
+### How to Contribute
+
+There are many ways you can contribute:
+
+1. Create an issue to share a bug you've discovered, or feature that is missing.
+
+2. Contribute to issue discussions to help identify what bugs and new features need implementing.
+
+3. Open a PR against an issue if you'd like to have a go at implementing it. Comment on the issue that you're going to take it on.
+
+4. Review PRs and test out other's changes.
+
+5. Comment on open PRs that you'd like to see in the next release.
+

data/README.md

@@ -1,5 +1,7 @@
 # Vagrant Provisioner: Docker Compose
 
+[![CircleCI](https://img.shields.io/circleci/build/github/leighmcculloch/vagrant-docker-compose?style=for-the-badge)](https://circleci.com/gh/leighmcculloch/vagrant-docker-compose/tree/master)
+
 A Vagrant provisioner for [Docker Compose](https://docs.docker.com/compose/). Installs Docker Compose and can also bring up the containers defined by a [docker-compose.yml](https://docs.docker.com/compose/yml/).
 
 ## Install
@@ -14,7 +16,7 @@ vagrant plugin install vagrant-docker-compose
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provision :docker
   config.vm.provision :docker_compose
@@ -25,7 +27,7 @@ end
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provision :docker
   config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", run: "always"
@@ -42,7 +44,7 @@ docker-compose -f [yml] up -d
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provision :docker
   config.vm.provision :docker_compose,
@@ -65,7 +67,7 @@ docker-compose -f [yml-0] -f [yml-1] ... up -d
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provision :docker
   config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: true, run: "always"
@@ -84,7 +86,7 @@ docker-compose -f [yml] up -d
 
 ```ruby
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   config.vm.provision :docker
   config.vm.provision :docker_compose, yml: "/vagrant/docker-compose.yml", rebuild: true,

data/Vagrantfile

@@ -2,41 +2,50 @@
 # vi: set ft=ruby :
 
 # ==============================================================================
-# This Vagrantfile is for testing the plugin. For an example of how to use the
-# plugin look at the Vagrantfile in the example directory.
+#
+# This Vagrantfile is for developing and testing the plugin. For an example of
+# how to use the plugin look at the Vagrantfile in the example directory.
+#
+# ==============================================================================
 #
 # If you are developing or contributing to this plugin you can use this
-# Vagrantfile. It is designed to be run inside a Docker container that is
-# already on a network called 'devenv'. The Vagrantfile tells Vagrant to start
-# the machine on the 'devenv' network, and to give the container's name
-# 'vagrant'. While portforwarding to the host for SSH still takes place it is
-# ignored and Vagrant connects directly to the SSH port on the 'vagrant'
-# container.
+# Vagrantfile. It supports being run automatically in two configurations:
+#
+# 1) Outside Docker, using Vagrant running on a host.
 #
-# Before using this file you'll want to run this command to install vagrant as
-# a gem:
-#   bundle install
+# 2) Inside a Docker container that has access to the Docker socket and attached
+#    to a network named 'devenv'. Run the following commands inside the Docker
+#    container.
 #
-# To start vagrant it is important to always use bundle exec:
-#   bundle exec vagrant up
+# In both configurations you can start it up with:
 #
-# To SSH into the container:
-#   bundle exec vagrant ssh
+#      bundle install
+#      bundle exec vagrant up
 #
-# To delete the container when finished:
-#   bundle exec vagrant destroy -f
+# All vagrant commands need to be prefixed with 'bundle exec'.
 #
 # ==============================================================================
 
+def inside_docker?
+  system("grep docker /proc/1/cgroup -qa")
+end
+
 Vagrant.configure("2") do |config|
+  inside_docker = inside_docker?
+
   config.vm.provider :docker do |d|
     d.image = "vagrant" # https://github.com/leighmcculloch/vagrant-docker-image
     d.has_ssh = true
-    d.create_args = ["--name=vagrant", "--network=devenv"]
+    d.create_args = [
+      "--name=vagrant",
+      ("--network=devenv" if inside_docker),
+    ].compact
   end
 
-  config.ssh.host = "vagrant"
-  config.ssh.port = 22
+  if inside_docker
+    config.ssh.host = "vagrant"
+    config.ssh.port = 22
+  end
 
   config.vm.provision :docker_compose, run: "always"
 end

data/example/Vagrantfile

@@ -8,7 +8,7 @@ unless Vagrant.has_plugin?("vagrant-docker-compose")
 end
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "ubuntu/trusty64"
+  config.vm.box = "ubuntu/bionic64"
 
   port = 9090
 

data/example/app/Dockerfile

@@ -1,3 +1,25 @@
-FROM ubuntu:14.04
-WORKDIR /app
-CMD while true ; do nc -l 8080 < /app/index.html ; done
+FROM ubuntu:bionic as builder
+
+RUN apt-get update -y && \
+  apt-get install -y \
+    build-essential \
+    curl
+
+RUN cd /tmp && \
+  curl -O http://download.redis.io/redis-stable.tar.gz && \
+  tar xvzf redis-stable.tar.gz && \
+  cd redis-stable && \
+  make && \
+  chmod 755 src/redis-cli
+
+FROM ubuntu:bionic
+
+# Install nc for web serving
+RUN apt-get update -y && apt-get install -y netcat curl
+
+# Install redis-cli
+COPY --from=builder /tmp/redis-stable/src/redis-cli /usr/local/bin/
+
+# Serve the date and a counter
+EXPOSE 8080
+CMD while true ; do nc -l -p 8080 -c 'echo "HTTP/1.1 200 OK\n\n$(date)\nVisit count: $(redis-cli -h redis incr visit_counter)"' ; done

data/lib/vagrant-docker-compose/installer.rb

@@ -18,10 +18,12 @@ module VagrantPlugins
           remote_tmp_path = nil
           Dir.mktmpdir do |local_tmp_dir|
             local_tmp_path = File.join(local_tmp_dir, "docker-compose")
-            File.open(local_tmp_path, "w") do |f|
+            File.open(local_tmp_path, "wb") do |f|
               contents = fetch_file(url)
               f.write(contents)
             end
+            sig = Digest::SHA256.file(local_tmp_path).hexdigest
+            @machine.ui.detail(I18n.t(:downloaded_signature, version: @config.compose_version, signature: sig))
 
             @machine.ui.detail(I18n.t(:uploading, version: @config.compose_version))
             remote_tmp_path = @machine.guest.capability(:docker_compose_upload, @config, local_tmp_path)

data/lib/vagrant-docker-compose/locales/en.yml

@@ -6,6 +6,7 @@ en:
   checking_installation: Checking for Docker Compose installation...
   getting_info: Getting machine and kernel name from guest machine...
   downloading: Downloading Docker Compose %{version} for %{kernel} %{machine}
+  downloaded_signature: Downloaded Docker Compose %{version} has SHA256 signature %{signature}
   uploading: Uploading Docker Compose %{version} to guest machine...
   installing: Installing Docker Compose %{version} in guest machine...
   symlinking: Symlinking Docker Compose %{version} in guest machine...

data/lib/vagrant-docker-compose/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module DockerComposeProvisioner
-    VERSION = "1.5.0"
+    VERSION = "1.5.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-docker-compose
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Leigh McCulloch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-09-28 00:00:00.000000000 Z
+date: 2019-10-27 00:00:00.000000000 Z
 dependencies: []
 description: A Vagrant provisioner for docker compose.
 email: 
@@ -16,7 +16,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
@@ -24,8 +26,6 @@ files:
 - Vagrantfile
 - example/Vagrantfile
 - example/app/Dockerfile
-- example/app/index.html
-- example/app/init.sh
 - example/docker-compose-base.yml
 - example/docker-compose.yml
 - lib/vagrant-docker-compose.rb

data/example/app/index.html

@@ -1,9 +0,0 @@
-<html>
-  <head>
-    <title>An App</title>
-  </head>
-  <body>
-    <h1>An App</h1>
-    <p>An app that serves static.</p>
-  </body>
-</html>

data/example/app/init.sh

@@ -1 +0,0 @@
-while true ; do nc -l 8080 < /app/index.html ; done