vps 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933bc1ae373f67158e536ef0f9fba44ce4dc7173
-  data.tar.gz: 4dc3addd296f9b7d7fd836ff3a82262572b21344
+  metadata.gz: 495b59ec7e4efd137d87d03d2d5592512849879f
+  data.tar.gz: d9bf0c254e4e532e051a892096ba8cbdfbedda3b
 SHA512:
-  metadata.gz: 7eb4e3894ac019a90d984987761c5f03e57f1bdf35f9417bb1aa1df4ec817c9d3071d8715217516b4a6e0da237a0ddc9baacd413e807746ed243205f9ee256b7
-  data.tar.gz: c913b9fd13f1180e99dfda46425187f7989064d5ba19c021f24d9913a89123b4a381b3aa4ce45fc708440d83c36d046e79aff86a42df1ac6c1c367d689549c6a
+  metadata.gz: bbc9e798ff049bcef6ca15750ca26a9fb6d015706068628118381d2a8702f1a041f7a6d55d0d2145a1e8de52c640e19f8d48e9eaf522a62d8714e22a518e1ad7
+  data.tar.gz: b52f3f9474ef1cc806bcf2fd14be10951641347a439016be2386e5d39c2c18c4575feabea7f4f4ab2042c87cebcf894a77f716daece7ed25fa77093d4edf46d5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## VPS CHANGELOG
 
+### Version 0.2.2 (January 2, 2020)
+
+* Automatically add container names for upstreams and services
+* Add opportunity to add lines to the generated Dockerfile
+
 ### Version 0.2.1 (January 2, 2020)
 
 * Support NodeJS based applications

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/lib/vps/cli/upstream.rb

@@ -12,10 +12,7 @@ module VPS
           spec = derive_upstream(path)
           config[:upstreams].push(spec.merge({
             :name => name || File.basename(path),
-            :path => path,
-            :compose => {
-              :container_name => name || File.basename(path)
-            }
+            :path => path
           }))
           VPS.write_config(host, config)
         end

data/lib/vps/version.rb

@@ -1,7 +1,7 @@
 module VPS
   MAJOR = 0
   MINOR = 2
-  TINY  = 1
+  TINY  = 2
 
   VERSION = [MAJOR, MINOR, TINY].join(".")
 end

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

@@ -34,12 +34,13 @@ services:
   <%- services.to_h.each do |name, spec| %>
 
   <%= name %>:
-<%= OpenStruct.to_hash(spec).to_yaml.sub(/^.*?\n/, "").indent(4) %>
+<%= OpenStruct.to_hash(spec).to_yaml.sub(/^.*?\n/, "").sub("\n", "\ncontainer_name: #{name}\n").indent(4) %>
   <%- end %>
   <%- upstreams.each do |upstream| %>
 
   <%= upstream.name %>:
     image: <%= upstream.name %>
+    container_name: <%= upstream.name %>
     restart: always
     <%- unless upstream[:compose].inspect.match(/\bports\b/) %>
     ports:

data/templates/docker/upstream/Dockerfile.node.erb

@@ -8,5 +8,8 @@ WORKDIR /opt/app
 COPY . .
 
 ENV NODE_ENV=production
+<%- if upstream.dockerfile %>
+<%= upstream.dockerfile.strip %>
+<%- end %>
 RUN npm install
 CMD ["npm", "start"]

data/templates/docker/upstream/Dockerfile.phoenix.erb

@@ -9,5 +9,8 @@ WORKDIR /opt/app
 COPY . .
 
 ENV MIX_ENV=prod
+<%- if upstream.dockerfile %>
+<%= upstream.dockerfile.strip %>
+<%- end %>
 RUN mix do deps.get --only prod, deps.compile
 CMD ["sh", "-c", "mix phx.server"]

data/templates/docker/upstream/Dockerfile.plug.erb

@@ -9,5 +9,8 @@ WORKDIR /opt/app
 COPY . .
 
 ENV MIX_ENV=prod
+<%- if upstream.dockerfile %>
+<%= upstream.dockerfile.strip %>
+<%- end %>
 RUN mix do deps.get --only prod, deps.compile
 CMD ["sh", "-c", "mix run --no-halt"]

data/templates/docker/upstream/Dockerfile.rack.erb

@@ -11,6 +11,9 @@ WORKDIR /opt/app
 COPY . .
 
 ENV RACK_ENV=production
+<%- if upstream.dockerfile %>
+<%= upstream.dockerfile.strip %>
+<%- end %>
 RUN gem install bundler -v <%= upstream.bundler_version %>
 RUN bundle install --without development test
 CMD ["bundle", "exec", "rackup", "config.ru", "-o", "0.0.0.0"]

data/templates/docker/upstream/Dockerfile.rails.erb

@@ -10,8 +10,12 @@ RUN apk update \
 WORKDIR /opt/app
 COPY . .
 
-ENV RAILS_ENV=production
 EXPOSE <%= upstream.port %>
+
+ENV RAILS_ENV=production
+<%- if upstream.dockerfile %>
+<%= upstream.dockerfile.strip %>
+<%- end %>
 RUN gem install bundler -v <%= upstream.bundler_version %>
 RUN bundle install --without development test
 CMD ["rm", "-f", "tmp/pids/server.pid"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vps
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Paul Engel