docker_compose_deploy 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: a607bdc2cebcd48c7905a97d19a6063f64cf3001
-  data.tar.gz: 51d0bcfd2c6df2de106b9e7be070b46db085ad7a
+SHA256:
+  metadata.gz: a67cafd94d70649827784bfeb5fe02c88327516a90b9f19a387bd2636360cfca
+  data.tar.gz: 811a9defd40ef501304f64f597a90aefb82d1a5de037ca72227d34e8e0bd0a36
 SHA512:
-  metadata.gz: e6d4e8aa9a3d15d565448fc6ab0f054b8a616f4a9d2216a6007fd5933dd139a73f6601b7a8a1b544f71aef255e4d504f0bb994389a22553ad63fca8d704c277a
-  data.tar.gz: a6e921950fd6d358a0e1c9670942998e9c3fc5ef9572f4aa40fd0fd707e67a5e0a70f84e9b520e804e0ee14610598f6576db748359b54eca539711636555a840
+  metadata.gz: e711255f0ea8e5b3eb999ceb27b653ccf83ea90cf6bdf64879b4944d1ad63629696f455b897ecfed223f35fdc1159f251a1f73c645307039d7325efb6c05479d
+  data.tar.gz: 05dcb27c7ed4d7aa352731e5c7394eacc9eca755b97c2a49c98054d06666c0c3431c2e0dfe9b36d204da719ec623d1634daba64ff6636556ef91ef3c4ec44c98

data/README.md

@@ -12,20 +12,6 @@ While these scripts are great for your personal projects, they will not help you
 
 This doesn't provide much over using docker-machine, but it will simplify working with volumes and allow you to test your deployment in a realistic environment.
 
-### Commands
-
-Each command takes an optional `-e [environment]`. If the environment is not set, it will default to `test`. This environment corresponds to the entry in `config.yml`. There you can configure the connection string for sshing to the host. By default the `test` environment is set up to connect to the vagrant host configured in the Vagrantfile.
-
-`dcd new [project_name]`: Scaffold a new project.
-
-`dcd provision`: Install Docker & DockerCompose on the host machine.
-
-`dcd deploy`: Push your `docker-compose.yml` to the host machine, create directories for volume-mapping (explained below), pull the required docker images, and run `docker-compose up`.
-
-`dcd backup`: Tar, bzip, and download the `./sites/data` for safekeeping.
-
-`dcd push [image_names]`: __If all of your images are on hub.docker.com, then you don't need this command.__ Normally you might push your docker images to http://hub.docker.com. However, you might have some images that you'd prefer to keep private. This command will take a local image, tar it, push it to the remote host. Using `dcd push` you do not need to push your private image to docker hub. This is significantly slower than using the registry because you need to push the entire image each time. Note that if you use this command, you will need to set `ignore_pull_failures: true` in your `config.yml`.
-
 
 ### The big picture
 
@@ -46,6 +32,20 @@ As I add new apps I must update my nginx config. Testing this can be tricky, sin
 - Push your project to a vagrant machine
 - Create entries in `/etc/hosts` on the vagrant machine to help you test your nginx config
 
+### Commands
+
+Each command takes an optional `-e [environment]`. If the environment is not set, it will default to `test`. This environment corresponds to the entry in `config.yml`. There you can configure the connection string for sshing to the host. By default the `test` environment is set up to connect to the vagrant host configured in the Vagrantfile.
+
+`dcd new [project_name]`: Scaffold a new project.
+
+`dcd provision`: Install Docker & DockerCompose on the host machine.
+
+`dcd deploy`: Push your `docker-compose.yml` to the host machine, create directories for volume-mapping (explained below), pull the required docker images, and run `docker-compose up`.
+
+`dcd backup`: Tar, bzip, and download the `./sites/data` for safekeeping.
+
+`dcd push [image_names]`: __If all of your images are on hub.docker.com, then you don't need this command.__ Normally you might push your docker images to http://hub.docker.com. However, you might have some images that you'd prefer to keep private. This command will take a local image, tar it, push it to the remote host. Using `dcd push` you do not need to push your private image to docker hub. This is significantly slower than using the registry because you need to push the entire image each time. Note that if you use this command, you will need to set `ignore_pull_failures: true` in your `config.yml`.
+
 
 ### Installation
 

data/lib/docker_compose_deploy/actions/deployment.rb

@@ -10,14 +10,23 @@ module DockerComposeDeploy
         shell.scp!("./sites/config/", "#{connection}:./sites/config", "-r")
 
         docker_compose.services.each do |service_name|
+          shell.ssh!("mkdir -p ./sites/config/#{service_name}")
           shell.ssh!("mkdir -p ./sites/data/#{service_name}")
           shell.ssh!("mkdir -p ./sites/log/#{service_name}")
         end
 
-        shell.scp!(docker_compose.path, "#{connection}:./docker-compose.yml")
-        shell.ssh!("docker-compose down")
-        shell.ssh!("docker-compose pull #{ignore_pull_failures_option}")
-        shell.ssh!("docker-compose up -d")
+        if DockerComposeDeploy.config.stack?
+          shell.scp!(docker_compose.path, "#{connection}:./docker-stack.yml")
+          shell.ssh!("docker node ls || docker swarm init") # ensure a swarm is initialized
+          shell.ssh!("docker stack rm dcd_stack || exit 0") # try to remove previous stack
+          shell.ssh!("while docker ps | grep dcd > /dev/null; do echo 'waiting for shutdown' && sleep 1; done")
+          shell.ssh!("docker stack deploy --compose-file docker-stack.yml dcd_stack")
+        else
+          shell.scp!(docker_compose.path, "#{connection}:./docker-compose.yml")
+          shell.ssh!("docker-compose down")
+          shell.ssh!("docker-compose pull #{ignore_pull_failures_option}")
+          shell.ssh!("docker-compose up -d")
+        end
 
         shell.notify "success"
       end

data/lib/docker_compose_deploy/actions/server.rb

@@ -8,8 +8,10 @@ module DockerComposeDeploy
         shell.ssh!("sudo usermod -aG docker $USER")
         shell.ssh!("true", "-O exit") # resets the connection, so that our group changes take effect
 
-        shell.ssh!("wget -qO- https://get.docker.com/ | bash")
-        shell.ssh!("curl -L https://github.com/docker/compose/releases/download/1.11.1/run.sh > ./docker-compose")
+        shell.ssh!("curl -L https://get.docker.com/ > ./docker-install")
+        shell.ssh!("bash docker-install")
+        shell.ssh!("rm docker-install")
+        shell.ssh!("curl -L https://github.com/docker/compose/releases/download/2.27.1/run.sh > ./docker-compose")
         shell.ssh!("chmod +x docker-compose")
         shell.ssh!("sudo mv ./docker-compose /usr/local/bin/docker-compose")
         shell.ssh!("docker-compose -v")

data/lib/docker_compose_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerComposeDeploy
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

data/lib/docker_compose_deploy.rb

@@ -31,6 +31,10 @@ module DockerComposeDeploy
       config_block.fetch("domains", [])
     end
 
+    def stack?
+      config_block.fetch("stack", false)
+    end
+
     private
 
     def config_block

data/template/config.yml

@@ -14,7 +14,9 @@
 #
 ################################################################
 #
-# "connection": How we connect to the host machine
+# "connection": "user@host"
+#
+# How we connect to the host machine
 #
 # For each, we must configure the connection string that we use
 # to connect to the host using ssh. The "test" environment is
@@ -23,7 +25,9 @@
 #
 ################################################################
 #
-# "ignore_pull_failures": Pull Failures configuration
+# "ignore_pull_failures": true/false
+#
+# Pull Failures configuration
 #
 # For each environment we can also set the "ignore_pull_failures"
 # flag. This flag is used when deploying your docker-compose.yml.
@@ -45,7 +49,26 @@
 #
 ################################################################
 #
-# "domains" => Urls to hijack on the host machine
+# "stack": true/false
+#
+# Deploy using docker stack
+#
+# Since docker-compose seems to be on its way out, this flag
+# allows you to deploy your docker-compose file using docker stack
+#
+# This is recommended.
+#
+# If your deployment is not working, try checking
+#
+#   docker node ps
+#
+# for information on why your containers are not starting.
+#
+################################################################
+#
+# "domains" => ["domain1", "domain1"]
+#
+# Urls to hijack on the host machine
 #
 # It can be tricky to ensure that the nginx configuration that
 # your proxy is using is routing things to the correct docker
@@ -71,10 +94,12 @@
 test:
   connection: "vagrant@default"
   ignore_pull_failures: false
+  stack: true
   domains:
     - www.test
     - site1.test
     - site2.test
 production:
+  stack: true
   connection: "user@yourserver"
   ignore_pull_failures: false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker_compose_deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Pete Kinnecom
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-03-17 00:00:00.000000000 Z
+date: 2024-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -52,7 +52,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: 
+description:
 email:
 - rubygems@k7u7.com
 executables:
@@ -90,7 +90,7 @@ homepage: http://github.com/petekinnecom/docker_compose_deploy
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -105,10 +105,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
-signing_key: 
+rubygems_version: 3.4.19
+signing_key:
 specification_version: 4
 summary: Easily deploy a Docker Compose project
 test_files: []
-has_rdoc: