shiplane 0.1.13 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8bcdb46af3b90740ae1067f26b12e4f1bebbb7f2df457b64041f863d8f655902
-  data.tar.gz: 5f5d73368d18650d8cf308b8c2320c1d04e904d41e616b2da2d049af21c9264b
+  metadata.gz: b3978345f9fe5400740994a53ea541323e3ac8a88231a438b70ad3fa8bb74860
+  data.tar.gz: 6a9cfa333eb444c5256839cbacc6eda6400dccf416ee92548944c0ad1462f9a1
 SHA512:
-  metadata.gz: f0946aa51572a04b1533a531bcd3674eec1612d37e649e7b140dc6ca985ad2e663cecbbc9abc7e24b593ced7c4ffef3bbd5b8ec363139df061183fa25bc87420
-  data.tar.gz: 5d64850c4e83f9a8e9de63c4a98800f54b5c8cab8a7a94def5251a94c29874300ebdc97e5f3cfd20882634c0ea341b90c28b712d2dfd30326720b65a2170cd34
+  metadata.gz: da23668beb83eb1d3ceb91d1664ced166926c1efe4a91c3203c589c4a97773f014604196fc1f603c75d81a9d0a00cbd60e3061723010adc0d21aa05e9bdd8618
+  data.tar.gz: 6b22953994b505449348676471431c47f51e174b404c3e91c0b03739957ae9984ed081ae80c573745df8f81b546214ddc047bbf6ac4a5cb997b60c0cf91b04ca

data/README.md

@@ -75,6 +75,8 @@ rake shiplane:install[<application_name>]
 
 Reference the example [shiplane.ymls](examples/rails_app/shiplane.yml) for some ideas on how to configure your app.
 
+> **WARNING**: Make sure to configure your shiplane.yml here. The following commands make use of some or all of those configurations!!
+
 ### Using Shiplane
 #### Steps involved in provisioning and deploying
 Currently, Shiplane assumes you have an empty VM/VPS/Metal Box with some form of linux on it (though testing has primarily been done on Ubuntu boxes). Shiplane assumes an otherwise EMPTY install. It is HIGHLY recommended that you NOT use Shiplane (or any other provisioning) on an install with software other than a basic OS installed.
@@ -162,6 +164,11 @@ Shiplane::SafeBuild.wrap do
 end
 ```
 
+#### Using Build Cache
+Shiplane is designed to always build using the --no-cache flag in order to guaranteee clean, repeatable builds, but if you find yourself troubleshooting or otherwise needing to build multiple times, you might like to use the following flag to speed up the process. Note that this is intended to be a debugging tool. Using it for production building could potentially part of the build process to run in one context and another part to run in another. Such a case might cause both positive and negative results that are difficult to troubleshoot because they are not repeatable. Don't do this, but DO use this responsibly to make your life easier when troubleshooting.
+
+`USE_BUILD_CACHE=true bundle exec cap production shiplane`
+
 ## Becoming Involved
 ### Community Channels
 You can join our [Discord community](https://discord.gg/drrn2YG) to ask any questions you might have or to get ahold of someone in the community who might be able to help you (I hang out here just about every day of the week and most of the weekend). There is no guarantee of service implied, but we absolutely believe in helping out our fellow developers and will do so as we are able. If you feel you know some stuff about Shiplane, feel free to hang out and please help out as well!

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

@@ -21,8 +21,6 @@ RUN bundle install --deployment --jobs=4 --without development test
 
 RUN yarn install --production
 
-RUN rm -rf node_modules/n2-styles/test/
-
 RUN bundle exec rake assets:precompile
 
 RUN sed -i "s/${GITHUB_TOKEN}//" Gemfile.lock

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

@@ -9,6 +9,9 @@ bootstrap:
     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
 build:
+  registry:
+    # url: ghcr.io # for Github Container Service. Should work for similar services such as Gitlab
+    # url: :dockerhub # for default Dockerhub Service
   settings_folder: .shiplane
   environment_file: .env.production
   compose_filepath: docker-compose.yml

data/lib/shiplane/build.rb

@@ -21,6 +21,87 @@ module Shiplane
       Dotenv.overload File.join(Dir.pwd, build_config.fetch('environment_file', '.env'))
     end
 
+    def build!
+      unless File.exist?(File.join(project_folder, Shiplane::SHIPLANE_CONFIG_FILENAME))
+        Shiplane::CheckoutArtifact.checkout!(sha)
+        Shiplane::ConvertComposeFile.convert_output!(project_folder, sha)
+      end
+
+      buildable_artifacts.each do |(artifact_name, attributes)|
+        compose_context = docker_config.fetch('services', {}).fetch(artifact_name.to_s, {})
+        Shiplane::ConvertDockerfile.convert_output!(project_folder, attributes, compose_context)
+
+        FileUtils.cd project_folder do
+          steps(artifact_name, attributes).select{|step| step.fetch(:condition, true) }.each do |step|
+            puts step[:notify_before] if step.has_key? :notify_before
+            success = system(step[:command])
+            raise StepFailureException.new(step[:command], artifact_name) unless success
+            puts step[:notify_after] if step.has_key? :notify_after
+          end
+        end
+      end
+    rescue StepFailureException => e
+      puts e.message
+      raise if ENV['RAISE_EXCEPTIONS_ON_FAILED_BUILD']
+    end
+
+    def steps(artifact_name, attributes)
+      [
+        { command: build_command(artifact_name), notify_before: "Building Artifact: #{artifact_name}...", notify_after: "Docker Compose Built", stop_on_failure: true },
+        { command: tag_command(artifact_name, attributes, sha), notify_before: "Tagging Build [#{sha}]...", stop_on_failure: true },
+        { command: tag_command(artifact_name, attributes, "#{postfix}-#{sha}"), notify_before: "Tagging Build [#{postfix}-#{sha}]...", stop_on_failure: true, condition: !!postfix },
+        { command: tag_command(artifact_name, attributes, "#{postfix}-latest"), notify_before: "Tagging Build [#{postfix}-latest]...", stop_on_failure: true, condition: !!postfix && tag_latest },
+        { command: tag_command(artifact_name, attributes), notify_before: "Tagging Build [latest]...", stop_on_failure: true, condition: tag_latest },
+        { command: token_login_command , notify_before: "Logging into Container Registry...", stop_on_failure: true },
+        { command: push_command(attributes, "#{sha}"), notify_before: "Pushing Image", notify_after: "Completed Artifact: #{artifact_name}...", stop_on_failure: true },
+        { command: push_command(attributes, "#{postfix}-#{sha}"), notify_before: "Pushing #{postfix} Image", notify_after: "Completed Artifact: #{artifact_name}...", stop_on_failure: true, condition: !!postfix },
+        { command: push_command(attributes, "#{postfix}-latest"), notify_before: "Pushing Latest #{postfix} Image", notify_after: "Completed Latest Artifact: #{artifact_name}...", stop_on_failure: true, condition: !!postfix && tag_latest },
+        { command: push_command(attributes, "latest"), notify_before: "Pushing Latest Image", notify_after: "Completed Latest Artifact: #{artifact_name}...", stop_on_failure: true, condition: tag_latest },
+      ]
+    end
+
+    # Commands
+    def build_command(artifact_name)
+      [
+        'docker-compose',
+        'build',
+        build_cache_option,
+        artifact_name,
+      ].compact.join(' ')
+    end
+
+    def token_login_command
+      @token_login_command ||= [
+        'echo',
+        login_token,
+        '|',
+        'docker',
+        'login',
+        registry_url,
+        '--username',
+        login_username,
+        '--password-stdin',
+      ].compact.join(' ')
+    end
+
+    def tag_command(artifact_name, attributes, tag='latest')
+      [
+        'docker',
+        'tag',
+        build_output_image_name(artifact_name),
+        "#{repo_name(attributes)}:#{tag}",
+      ].compact.join(' ')
+    end
+
+    def push_command(attributes, tag='latest')
+      [
+        'docker',
+        'push',
+        "#{repo_name(attributes)}:#{tag}",
+      ].compact.join(' ')
+    end
+
+    # Properties
     def appname
       @appname ||= project_config['appname']
     end
@@ -45,44 +126,57 @@ module Shiplane
       build_config.fetch('artifacts', {})
     end
 
-    def build!
-      unless File.exist?(File.join(project_folder, Shiplane::SHIPLANE_CONFIG_FILENAME))
-        Shiplane::CheckoutArtifact.checkout!(sha)
-        Shiplane::ConvertComposeFile.convert_output!(project_folder, sha)
-      end
+    def default_registry_configuration
+      {
+        'url' => :dockerhub,
+        'auth_method' => 'token',
+      }
+    end
 
-      buildable_artifacts.each do |(artifact_name, attributes)|
-        compose_context = docker_config.fetch('services', {}).fetch(artifact_name.to_s, {})
-        Shiplane::ConvertDockerfile.convert_output!(project_folder, attributes, compose_context)
+    def dockerhub?
+      registry_configuration['url'] == :dockerhub
+    end
 
-        FileUtils.cd project_folder do
-          steps(artifact_name, attributes).select{|step| step.fetch(:condition, true) }.each do |step|
-            puts step[:notify_before] if step.has_key? :notify_before
-            success = system(step[:command])
-            raise StepFailureException.new(step[:command], artifact_name) unless success
-            puts step[:notify_after] if step.has_key? :notify_after
-          end
-        end
-      end
-    rescue StepFailureException => e
-      puts e.message
-      raise if ENV['RAISE_EXCEPTIONS_ON_FAILED_BUILD']
+    def token_auth?
+      registry_configuration['auth_method'] == 'token'
     end
 
-    def steps(artifact_name, attributes)
+    def registry_configuration
+      @registry_configuration ||= default_registry_configuration.merge(build_config.fetch('registry', {}))
+    end
+
+    def registry_url
+      @registry_url ||= dockerhub? ? nil : registry_configuration['url']
+    end
+
+    def repo_name(attributes)
       [
-        { command: "docker-compose build --no-cache #{artifact_name}", notify_before: "Building Artifact: #{artifact_name}...", notify_after: "Docker Compose Built", stop_on_failure: true },
-        { command: "docker tag #{attributes['repo']}:#{sha} #{attributes['repo']}:#{postfix}-#{sha}", notify_before: "Tagging Build...", stop_on_failure: true, condition: !!postfix },
-        { command: "docker tag #{attributes['repo']}:#{sha} #{attributes['repo']}:#{postfix}-latest", notify_before: "Tagging Build...", stop_on_failure: true, condition: !!postfix && tag_latest },
-        { command: "docker tag #{attributes['repo']}:#{sha} #{attributes['repo']}:latest", notify_before: "Tagging Latest Build...", stop_on_failure: true, condition: tag_latest },
-        { command: "echo '#{ENV['DOCKERHUB_PASSWORD']}' | docker login --username #{ENV['DOCKERHUB_USERNAME']} --password-stdin", notify_before: "Logging into DockerHub...", stop_on_failure: true },
-        { command: "docker push '#{attributes['repo']}:#{sha}'", notify_before: "Pushing Image", notify_after: "Completed Artifact: #{artifact_name}...", stop_on_failure: true },
-        { command: "docker push '#{attributes['repo']}:#{postfix}-#{sha}'", notify_before: "Pushing #{postfix} Image", notify_after: "Completed Artifact: #{artifact_name}...", stop_on_failure: true, condition: !!postfix },
-        { command: "docker push '#{attributes['repo']}:#{postfix}-latest'", notify_before: "Pushing Latest #{postfix} Image", notify_after: "Completed Latest Artifact: #{artifact_name}...", stop_on_failure: true, condition: !!postfix && tag_latest },
-        { command: "docker push '#{attributes['repo']}:latest'", notify_before: "Pushing Latest Image", notify_after: "Completed Latest Artifact: #{artifact_name}...", stop_on_failure: true, condition: tag_latest },
-      ]
+        registry_url,
+        attributes['repo'],
+      ].compact.join('/')
+    end
+
+    def login_token
+      return ENV['DOCKERHUB_PASSWORD'] if dockerhub? && token_auth?
+
+      ENV['SHIPLANE_CONTAINER_REGISTRY_TOKEN']
+    end
+
+    def login_username
+      return ENV['DOCKERHUB_USERNAME'] if dockerhub? && token_auth?
+
+      ENV['SHIPLANE_CONTAINER_REGISTRY_USERNAME']
+    end
+
+    def build_output_image_name(artifact_name)
+      @build_output_image_name ||= "#{appname}-#{sha}_#{artifact_name}:latest"
+    end
+
+    def build_cache_option
+      ENV['USE_BUILD_CACHE'] == 'true' ? nil : "--no-cache"
     end
 
+    # API Helper Methods
     def self.build!(sha, postfix = nil)
       new(sha, postfix: postfix).build!
     end

data/lib/shiplane/convert_compose_file.rb

@@ -32,10 +32,6 @@ module Shiplane
 
     def converted_output
       @converted_output ||= converted_compose_hash.dup.tap do |hash|
-        build_config.fetch('artifacts', {}).each do |(appname, config)|
-          hash.deep_merge!({ 'services' => { appname => { 'image' => "#{config['repo']}:#{sha}" } } })
-        end
-
         hash.traverse! do |key, value|
           if (key == 'env_file' && value == '.env.development')
             [key, '.env.production']

data/lib/shiplane/deploy/container_configuration.rb

@@ -17,8 +17,6 @@ module Shiplane
 
       def exposed_ports
         @exposed_ports ||= [options.fetch(:expose, [])].flatten - published_ports
-      rescue => e
-        binding.pry
       end
 
       def environment
@@ -83,7 +81,7 @@ module Shiplane
           docker_command(role),
           "run -d",
           volumes.map{|volume_set| "-v #{volume_set}" },
-          published_ports.map{|port| "--expose #{port} -p #{port}" },
+          published_ports.map{|port| "-p #{port}" },
           exposed_ports.map{|port| "--expose #{port}" },
           "--name #{unique_container_name}",
           virtual_host ? "-e VIRTUAL_HOST=#{virtual_host}" : nil,

data/lib/shiplane/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shiplane
 version: !ruby/object:Gem::Version
-  version: 0.1.13
+  version: 0.1.18
 platform: ruby
 authors:
 - John Epperson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-02 00:00:00.000000000 Z
+date: 2021-01-27 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.13
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: shiplane_deployers_capistrano_docker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.1.13
+        version: 0.1.18
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -62,42 +62,62 @@ dependencies:
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '12.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.0.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 12.0.0
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: gem-release
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 12.0.0
+        version: 2.0.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.2.1
 description: Converts docker-compose.yml files into images that can be uploaded to
   any docker image repository.
 email:
@@ -151,8 +171,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A toolbox for converting developer docker-compose files into production-ready