composify 0.4 → 0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c532c95da9471e8a4d1a5898bf74e29b5a1553ff
-  data.tar.gz: 6e3d5997e284c2029ddd61bf34846a5c265e2448
+SHA256:
+  metadata.gz: 6c9257ef134c05cd6e7049384c0a91dbc14a3b7895444376db1b35cdf0b08282
+  data.tar.gz: 64632561e60b7fc14ec7f861cb966b96e7cf98e0b2880ffe84bb1ef1fceba41d
 SHA512:
-  metadata.gz: 9c8d4c8494554c8f07ca8898db69544f489e3d0859d896fbdfd44d9dc7ae263a55634dc5b160ac65c626caff741faf4928e7e970b2f2991efd9cb71015fe9b79
-  data.tar.gz: ca83357b44576fc2c1de6917d1af8638a74ff2c45a7737b54e7a93b6753ecb2f5ed238a3fd9eaf80d6e002ecc0f2bb76da07a07ece89d34288c75b723167f2d5
+  metadata.gz: 26120017ec64aaf98d5a7f40fbefa1287c36a208dbe8607141443519de033b070bee8aeb6b39223cdd935d8084712fc3a73b497f3a38ce2be7b262d34fdb13f0
+  data.tar.gz: aa97749ba390d9ac1858fafd0aa328da41383a9ba1c28d59c8e2bac38643ce2a78b548bc0b2b9b781afddb8427fce1abe4e7c26b04fdc763f2dccd289a4a309d

data/README.md

@@ -44,14 +44,14 @@ And, many more.  See the Makefile
 ### Initial
 
 ```shell
-make && make up
+make && make start
 ```
 
 ### Code Iterations
 
 1. Make your code changes
 2. If using a compiled language, `make build` (or any pass-through target)
-3. `make run`, or `make up` depending on how you wish to see output.
+3. `make run`, or `make start` depending on how you wish to see output.
 
 ### Production (Non-Development) builds
 

data/lib/composify.rb

@@ -10,7 +10,8 @@ module Composify
     FILE_LIST = {
       :entrypoint => './templates/bin/entrypoint.sh.erb',
       :docker_compose => './templates/docker-compose.yml.erb',
-      :dockerfile_base => './templates/Dockerfile.erb',
+      :dockerfile_base => './templates/Dockerfile.base.erb',
+      :dockerfile_production => './templates/Dockerfile.production.erb',
       :dockerfile_development => './templates/Dockerfile.development.erb',
       :makefile => './templates/Makefile.erb',
       # :makefile_internal => './templates/Makefile.internal.erb',
@@ -72,7 +73,7 @@ module Composify
       opts[:resources] = opts[:resource].map{ |e| parse_resource(e) }
 
       opts[:root] = Dir.pwd
-      opts[:project_name] = File.basename( Dir.pwd ).gsub(/[^a-zA-Z0-9_]/, '')
+      opts[:project_name] = File.basename( opts[:root] ).gsub(/[^a-zA-Z0-9_]/, '')
 
       return opts
     end
@@ -96,6 +97,7 @@ module Composify
     end
 
     def generate
+
       b = binding
       Template::FILE_LIST.each_pair do |_, file|
         template = Template.new( file )

data/lib/templates/{Dockerfile.erb → Dockerfile.base.erb}

@@ -14,5 +14,5 @@ ADD        . <%= workdir %>
 
 # Do any other initializations steps here.
 
-ENTRYPOINT [ <%= workdir %>/bin/entrypoint.sh ]
+ENTRYPOINT [ "/bin/sh", "<%= workdir %>/bin/entrypoint.sh" ]
 CMD        [ "pass" ]

data/lib/templates/Dockerfile.production.erb

@@ -0,0 +1,4 @@
+FROM        <%= options[:project_name] %>_base:latest
+
+# If you have different or additional steps you want to take for a
+# non-development build, put them here.

data/lib/templates/Makefile.erb

@@ -63,7 +63,8 @@ rm-application:
 
 production:
 	@${DOCKER_COMPOSE} build base
-	@echo "Your image is ready and tagged as <%= options[:project_name] %>_base:latest"
+	docker build --file ./Dockerfile.production --tag <%= options[:project_name] %>_production:latest .
+	@echo "Your image is ready and tagged as <%= options[:project_name] %>_production:latest"
 
 reset:
 	@echo "Fully resetting the environment"

data/lib/templates/bin/entrypoint.sh.erb

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/sh
 set -e
 
 cmd=$1; shift

data/lib/templates/docker-compose.yml.erb

@@ -8,7 +8,7 @@ services:
 
   base:
     build:
-      dockerfile: Dockerfile
+      dockerfile: Dockerfile.base
       context: ./
     command:
       - pass

data/lib/version.rb

@@ -1,3 +1,3 @@
 module Composify
-  VERSION = "0.4"
+  VERSION = "0.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composify
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.7'
 platform: ruby
 authors:
 - Brett Nakashima
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-14 00:00:00.000000000 Z
+date: 2018-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -53,8 +53,9 @@ extra_rdoc_files: []
 files:
 - "./bin/composify"
 - "./lib/composify.rb"
+- "./lib/templates/Dockerfile.base.erb"
 - "./lib/templates/Dockerfile.development.erb"
-- "./lib/templates/Dockerfile.erb"
+- "./lib/templates/Dockerfile.production.erb"
 - "./lib/templates/Makefile.erb"
 - "./lib/templates/Makefile.internal.erb"
 - "./lib/templates/bin/entrypoint.sh.erb"
@@ -83,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Makefile driven docker-compose development environment.