enable docker-sync-stack to understand docker-compose-dev and do adjust our example reflecting that

Author: EugenMayer

example/docker-compose-dev.yml

@@ -0,0 +1,17 @@
+# Development environment reusing production and just adding mounts for docker-sync
+version: "2"
+services:
+  someapp:
+    environment:
+      RAILS_ENV: 'development'
+    volumes_from:
+      - container:fullexample-sync:rw # will be mounted on /var/www
+  otherapp:
+    volumes_from:
+      - container:simpleexample-sync:rw # will be mounted on /app/code
+
+volumes:
+  fullexample-sync:
+    external: true
+  simpleexample-sync:
+    external: true

example/docker-compose.yml

@@ -1,23 +1,12 @@
+# production docker-compose file without any reference to docker-sync
+
 version: "2"
 services:
   someapp:
     image: alpine
     container_name: 'fullexample_app'
-    # that the important thing
-    volumes_from:
-      - container:fullexample-sync:rw # will be mounted on /var/www
     command: ['watch', '-n1', 'cat /var/www/somefile.txt']
   otherapp:
     image: alpine
     container_name: 'simpleexample_app'
-    command: ['watch', '-n1', 'cat /app/code/somefile.txt']
-    # thats the important thing
-    volumes_from:
-      - container:simpleexample-sync:rw # will be mounted on /app/code
-
-# thats the important thing
-volumes:
-  fullexample-sync:
-    external: true
-  simpleexample-sync:
-    external: true
+    command: ['watch', '-n1', 'cat /app/code/somefile.txt']

example/docker-sync.yml

@@ -1,7 +1,10 @@
 # for a simpler example, see the boilerplate at https://github.com/EugenMayer/docker-sync-boilerplate
 options:
-  # default: docker-compose.yml if you like, you can set a custom location (path) of your compose file
+  # optional, default: docker-compose.yml if you like, you can set a custom location (path) of your compose file
   compose-file-path: 'docker-compose.yml'
+  # optional, default: docker-compose-dev.yml if you like, you can set a custom location (path) of your compose file. Do not set it, if you do not want to use it at all
+  # if its there, it gets used, if you name it explicitly, it HAS to exist
+  compose-dev-file-path: 'docker-compose-dev.yml'
   # optional, activate this if you need to debug something, default is false
   verbose: true
   # ADVANVED: default:eugenmayer/rsync -  the image to use for the rsync container. Do not change this until you exactly know, what you are doing

lib/docker-sync/compose.rb

@@ -6,15 +6,38 @@ class ComposeManager
   @global_options
   def initialize(global_options)
     @global_options = global_options
-    compose_file_path = 'docker-compose.yml'
+
+    ### production docker-compose.yml
+    compose_files = [File.expand_path('docker-compose.yml')]
     if @global_options.key?('compose-file-path')
       path = File.expand_path(@global_options['compose-file-path'])
       unless File.exist?(path)
         raise("Your referenced docker-compose file in docker-sync.yml was not found at #{@global_options['compose-file-path']}")
       end
-      compose_file_path = @global_options['compose-file-path']
+      compose_files = [path]  # replace
+    end
+
+    ### development docker-compose-dev.yml
+    if @global_options.key?('compose-dev-file-path')
+      # explicit path given
+      path = File.expand_path(@global_options['compose-dev-file-path'])
+      unless File.exist?(path)
+        raise("Your referenced docker-compose-dev file in docker-sync.yml was not found at #{@global_options['compose-dev-file-path']}")
+      end
+      say_status 'ok',"Found explicit docker-compose-dev.yml and using it from #{@global_options['compose-dev-file-path']}", :green
+      compose_files.push @global_options[path]  # add
+    else
+      # try to find docker-compose-dev.yml
+      e = compose_files.to_enum
+      production_compose_file = File.expand_path(e.peek)
+      working_dir = File.dirname(production_compose_file)
+      compose_dev_path = "#{working_dir}/docker-compose-dev.yml"
+      if File.exist?(compose_dev_path)
+        say_status 'ok',"Found implicit docker-compose-dev.yml and using it from #{compose_dev_path}", :green
+        compose_files.push compose_dev_path
+      end
     end
-    @compose_session = Docker::Compose::Session.new(dir:'./', :file => compose_file_path)
+    @compose_session = Docker::Compose::Session.new(dir:'./', :file => compose_files)
   end
 
   def run

tasks/stack/stack.thor

@@ -44,17 +44,15 @@ class Stack < Thor
 
     begin
       compose_thread.join
-        #@sync_manager.join_threads
-    rescue SystemExit, Interrupt
-      say_status 'shutdown', 'Shutting down...', :blue
-
-      @sync_manager.stop
-      @compose_manager.stop
-    rescue Exception => e
-
-      puts "EXCEPTION: #{e.inspect}"
-      puts "MESSAGE: #{e.message}"
+      #@sync_manager.join_threads
+      rescue SystemExit, Interrupt
+        say_status 'shutdown', 'Shutting down...', :blue
 
+        @sync_manager.stop
+        @compose_manager.stop
+      rescue Exception => e
+        puts "EXCEPTION: #{e.inspect}"
+        puts "MESSAGE: #{e.message}"
     end
   end