fix a bug

wshihadeh · Jul 21, 2019 · 105855b · 105855b
1 parent d83867f
commit 105855b
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -95,8 +95,6 @@ set :mysql,
   {application}_docker_image: Docker image name
   {application}_docker_image_tag: Docker image tag.
 
-
-
 ## Application Seeds
 
 - Define your application seeds

diff --git a/lib/swarm_orca/new.rb b/lib/swarm_orca/new.rb
@@ -29,7 +29,6 @@ def execute
           capistrano/Capfile
           nginx/Dockerfile
           nginx/nginx.conf
-          nginx/htpasswd
           redis/Dockerfile
           redis/redis.conf
           capistrano/config/deploy/template_stage.rb

diff --git a/lib/swarm_orca/orca_cli.rb b/lib/swarm_orca/orca_cli.rb
@@ -17,9 +17,9 @@ class OrcaCli < Thor
 
       def new(orca_directory_name, git_fork, docker_network)
         New.new(root_dir: Dir.pwd,
-                orca_directory_name: orca_directory_name,
+                orca_dir_name: orca_directory_name,
                 git_fork: git_fork,
-                docker_network: docker_network).execute
+                network: docker_network).execute
       end
 
       desc 'gen_enc_key', 'This Command will generate new encryption key'

diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-elasticsearch.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-elasticsearch.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -19,4 +19,4 @@ services:
     deploy:
       replicas: 1
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-errbit.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-errbit.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -13,7 +13,7 @@ services:
     deploy:
       replicas: 1
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
 
   errbit_web:
     image: ${ERRBIT_DOCKER_IMAGE}:${ERRBIT_DOCKER_IMAGE_TAG}
@@ -40,4 +40,4 @@ services:
       test: "curl --fail http://localhost:8080/users/sign_in || exit 1"
       interval: 5s
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-mysql.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-mysql.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -14,4 +14,4 @@ services:
       - MYSQL_ROOT_PASSWORD=dummy
     deploy:
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-nginx.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-nginx.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -19,4 +19,4 @@ services:
         parallelism: 1
         delay: 3s
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-rabbitmq.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-rabbitmq.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -16,4 +16,4 @@ services:
     deploy:
       replicas: 1
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/templates/orca/application_stack/docker-stack-redis.yml.erb.tt b/lib/swarm_orca/templates/orca/application_stack/docker-stack-redis.yml.erb.tt
@@ -1,7 +1,7 @@
 version: '3.7'
 
 networks:
-  <%= NETWORK %>:
+  <%%= NETWORK %>:
     external: true
 
 services:
@@ -16,4 +16,4 @@ services:
     deploy:
       replicas: 1
     networks:
-      - <%= NETWORK %>
+      - <%%= NETWORK %>
diff --git a/lib/swarm_orca/version.rb b/lib/swarm_orca/version.rb
@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SwarmOrca
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end