shiplane 0.1.17 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ae8f35e9d9eb37af8026cc7664a99a91df38b4509013077f346b19b09120c68
-  data.tar.gz: 6187a0375ef86304831505932a475d046afa0b74d81a3214a11bcd27ea50beef
+  metadata.gz: e6287f0c051a021eda164d50d8aa8c1b6188558346c482cdaae3138cdc5530bf
+  data.tar.gz: 50d05109e351a27dac7a9a1756cec67d0a986aa3d095c181704651b639a6eaa7
 SHA512:
-  metadata.gz: 24e26faa8239207b66a7d47b72cee33a0b48641d3574123422d2b861254c2302585708001cc69810d163cbe2535190aa4d13e8923d1b420f87d013ba83bff963
-  data.tar.gz: b0e074456a000474e575ca1f273bf2eb49128de78d96f68e9859dba0b1c58a8416077571d4f03aba023745298648be7a91e08779ef7ee8d9fa1d1cd6d451db0f
+  metadata.gz: 0e525defd47ffc63fc57b53f78c6c2b232e375b9457b2554b2d670cbea5d3fe38e863b9e29a474737d97b79c23f153077623b78e39fa5d7f66edaadd94c8623a
+  data.tar.gz: 119147343d5d80fdd768eefd56c734b55c4c04b9deb0dc133c0b41d537fa9ff31b9caad55a810c6b89de668745e8dd275df736053f07cd65661e20e6245d2944

data/lib/generators/shiplane/install/templates/deploy.rb.erb

@@ -8,7 +8,7 @@ lock '3.11.0'
 set :application, 'podcaster'
 set :repo_url, 'git@github.com:kirillian/podcaster.git'
 
-set :deploy_to, '/var/www/battlecryforfreedom'
+set :deploy_to, '/var/www/my_app_network'
 
 # Default value for :log_level is :debug
 # set :log_level, :debug
@@ -54,8 +54,21 @@ set :sha, `git rev-parse HEAD`.chomp
 set :shiplane_docker_registry_username, ENV['DOCKERHUB_USERNAME']
 set :shiplane_docker_registry_password, ENV['DOCKERHUB_PASSWORD']
 
+
+set :shiplane_build_environment_variables, {
+  # The following example Fetches RAILS_ENV from your Capistrano environment-specific configuration
+  # RAILS_ENV: proc { fetch(:rails_env, 'production') },
+}
+
+# The following setting points shiplane to Github's Registry
+# set :shiplane_docker_registry_url, 'ghcr.io'
+
+# The following settings assign the username and token/password needed to login to a given registry
+# set :shiplane_docker_registry_username, ENV['SHIPLANE_CONTAINER_REGISTRY_USERNAME']
+# set :shiplane_docker_registry_token, ENV['SHIPLANE_CONTAINER_REGISTRY_TOKEN']
+
 set :shiplane_networks, {
-  battlecryforfreedom: {
+  my_app_network: {
     connections: [
       "nginx_reverse_proxy",
       "nginx-proxy-letsencrypt",
@@ -65,28 +78,28 @@ set :shiplane_networks, {
 
 set :shiplane_containers, {
   app: {
-    alias: 'battlecryforfreedom-app',
+    alias: 'my_app-app',
     volumes: [],
     environment: [],
     expose: 3000,
     capistrano_role: "docker",
-    repo: "kirillian2/podcaster",
+    repo: "my_docker_repo_account_name/my_docker_repo",
     command: 'bin/start',
-    virtual_host: "battlecryforfreedom.com",
-    letsencrypt_email: "john.epperson@battlecryforfreedom.com",
+    virtual_host: "my_app.com",
+    letsencrypt_email: "john.epperson@my_app_network.com",
     networks: [
-      "battlecryforfreedom"
+      "my_app_network"
     ],
   },
   sidekiq: {
-    alias: 'battlecryforfreedom-sidekiq',
+    alias: 'my_app-sidekiq',
     volumes: [],
     environment: [],
     capistrano_role: "docker",
-    repo: "kirillian2/podcaster",
+    repo: "my_docker_repo_account_name/my_docker_repo",
     command: 'bin/start_sidekiq_workers',
     networks: [
-      "battlecryforfreedom"
+      "my_app_network"
     ],
   },
   redis: {
@@ -101,22 +114,37 @@ set :shiplane_containers, {
     repo: "redis",
     tag: "4.0.9-alpine",
     networks: [
-      "battlecryforfreedom"
+      "my_app_network"
     ],
+    deploy: {
+      # This setting will tell shiplane NOT to restart this container every deploy
+      restart: false,
+    },
   },
   postgres: {
     alias: 'postgres',
     volumes: [
       "/var/lib/postgres/data:/var/lib/postgresql/data",
     ],
+    environment: {
+      POSTGRES_PASSWORD: ENV['DATABASE_PASSWORD'],
+      POSTGRES_USER: ENV['DATABASE_USERNAME'],
+    },
+    flags: {
+      'shm-size' => '256MB',
+    },
     expose: 5432,
     publish: 5432,
     capistrano_role: "docker",
     repo: "postgres",
     tag: "9.6",
     networks: [
-      "battlecryforfreedom"
+      "my_app_network"
     ],
+    deploy: {
+      # This setting will tell shiplane NOT to restart this container every deploy
+      restart: false,
+    },
   },
 }
 

data/lib/generators/shiplane/install/templates/production_dockerfile_stages.erb

@@ -6,6 +6,8 @@ COPY . $APP_PATH
 
 WORKDIR $APP_PATH
 
+ARG RAILS_ENV production
+ENV RAILS_ENV $RAILS_ENV
 ARG GITHUB_TOKEN
 ENV GITHUB_TOKEN $GITHUB_TOKEN
 ENV SHIPLANE building
@@ -36,7 +38,8 @@ WORKDIR $APP_PATH
 RUN bundle config --local path vendor/bundle
 RUN bundle config --local without development:test:assets
 
-ENV RAILS_ENV production
+ARG RAILS_ENV production
+ENV RAILS_ENV $RAILS_ENV
 ENV SHIPLANE running
 ENV RAILS_LOG_TO_STDOUT true
 ENV RAILS_SERVE_STATIC_FILES true

data/lib/generators/shiplane/install/templates/shiplane.yml.erb

@@ -6,8 +6,8 @@ project:
 bootstrap:
   env_file: .env.production
   chef-bootstrapper:
-    package_name: chefdk_3.6.57-1_amd64.deb
-    package_url: https://packages.chef.io/files/stable/chefdk/3.6.57/ubuntu/18.04/chefdk_3.6.57-1_amd64.deb
+    package_name: chefdk_3.13.1-1_amd64.deb
+    package_url: https://packages.chef.io/files/stable/chefdk/3.13.1/ubuntu/16.04/chefdk_3.13.1-1_amd64.deb
 build:
   registry:
     # url: ghcr.io # for Github Container Service. Should work for similar services such as Gitlab
@@ -34,9 +34,9 @@ build:
       - services.container-name.depends_on
 deploy:
   servers:
-    # put the server domain or ip address here
+    # `server-url` is your server domain or ip address here (e.g. `12.345.67.89` or `myapp.com`)
     server-url:
-      # Only set this flag if you need docker to run as the sudo user (default Ubuntu AMI on AWS requires this)
+      # Only set this flag if you need docker to escalate permissions and run everything as sudo (default Ubuntu AMI on AWS requires this)
       requires_sudo: false
       # Put SSH options here
       # ssh_options:

data/lib/shiplane/build.rb

@@ -19,6 +19,16 @@ module Shiplane
       @postfix = postfix
 
       Dotenv.overload File.join(Dir.pwd, build_config.fetch('environment_file', '.env'))
+
+      # Add any ENV variable overrides from the capistrano configuration
+      environment_variable_overrides = fetch(:shiplane_build_environment_variables, {})
+      environment_variable_overrides.each do |key, value|
+        if value.is_a? Proc
+          ENV[key.to_s] = value.call
+        else
+          ENV[key.to_s] = value
+        end
+      end
     end
 
     def build!
@@ -73,7 +83,7 @@ module Shiplane
     def token_login_command
       @token_login_command ||= [
         'echo',
-        login_token,
+        "\"#{login_token}\"",
         '|',
         'docker',
         'login',

data/lib/shiplane/deploy/container_configuration.rb

@@ -44,7 +44,11 @@ module Shiplane
       end
 
       def virtual_host
-        @virtual_host ||= options[:virtual_host]
+        return @virtual_host if defined?(@virtual_host) && @virtual_host
+
+        if options[:virtual_host]
+          @virtual_host = options[:virtual_host].is_a?(Proc) ? options[:virtual_host].call : options[:virtual_host]
+        end
       end
 
       def letsencrypt_host
@@ -64,7 +68,7 @@ module Shiplane
       end
 
       def network_connect_commands(role)
-        @network_commands ||= networks.map do |network|
+        @network_commands ||= networks[1..-1].map do |network|
           [
             docker_command(role),
             "network connect",
@@ -84,6 +88,8 @@ module Shiplane
           published_ports.map{|port| "-p #{port}" },
           exposed_ports.map{|port| "--expose #{port}" },
           "--name #{unique_container_name}",
+          "--network=#{networks.first}",
+          "--network-alias=#{network_alias}",
           virtual_host ? "-e VIRTUAL_HOST=#{virtual_host}" : nil,
           letsencrypt_host ? "-e LETSENCRYPT_HOST=#{letsencrypt_host}" : nil,
           letsencrypt_email ? "-e LETSENCRYPT_EMAIL=#{letsencrypt_email}" : nil,

data/lib/shiplane/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Shiplane
-  VERSION = "0.1.17"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.2.5
 platform: ruby
 authors:
 - John Epperson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-26 00:00:00.000000000 Z
+date: 2021-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shiplane_bootstrappers_chef
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.2.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.17
+        version: 0.2.5
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -156,7 +156,7 @@ homepage: https://github.com/kirillian/shiplane
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A toolbox for converting developer docker-compose files into production-ready
   images.