shipitron 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c5423fc9dbd202488e45ab382ad2bc37de889d909179b6e65a33d362ad9d20c
-  data.tar.gz: ea5bea8068a0d5d2ac0787c5590d53c3bf5a7f88ba6d646474d760b21dd4b707
+  metadata.gz: c1f02ed921fdb5107cebc789f0554daac22d275024e50b94f6059d0ab6d996c1
+  data.tar.gz: 65e5fbca1de1090e34178d44244a5e30938b7de80fe17f0ea7b3df9510e54f9a
 SHA512:
-  metadata.gz: 9983df8f5f01ea66a28e4bf7499bfed81bf49bc0127895669d003176861ad6db04b48a8c351215cd17ab927b1eb4b9087f203075206e2967be01429c8cd15d21
-  data.tar.gz: b5f1be2174a00e52ec0fb5df6ee04a64ac83ed73f09e6651fcf5655cb9a0c85f1746cbf30bf6bd8388f97668aac129bd1ef32980e79c44ffd645f656fe9213e5
+  metadata.gz: 14d5f5e245ab946538ab1aee9b5d88d88fafb7d4baa61c3634d165d42acfcf5a83e0231cc9299f37d37d38da9a96be0dfc04ba77b42499fc36bdcc5acf69980c
+  data.tar.gz: ace846368647ec022343af65af9978f2647aa7113de1795900a18091754e34e26657bd4d4d4be10e60f4bef81baffa886917c79537f834377182eadabb4a704e

data/.dockerignore

@@ -2,3 +2,4 @@
 /pkg/
 Gemfile.lock
 /tmp/
+/spec/fixtures/test_repo

data/.gitattributes

@@ -0,0 +1 @@
+spec/fixtures/test_repo.tgz filter=lfs diff=lfs merge=lfs -text

data/.gitignore

@@ -3,3 +3,4 @@
 Gemfile.lock
 /tmp/
 /cache/
+/spec/fixtures/test_repo

data/Dockerfile

@@ -15,17 +15,19 @@ RUN addgroup -S shipitron && \
 
 RUN apk add --no-cache \
     ca-certificates \
-    openssl \
+    openssl-dev \
     tini \
     su-exec \
     build-base \
     git \
+    git-lfs \
     openssh-client \
     perl \
     bash \
     curl \
     wget \
-    jq
+    jq \
+    cmake
 
 ENV ECR_CREDENTIAL_HELPER_VERSION 0.4.0
 RUN cd /usr/local/bin && \

data/Dockerfile.release

@@ -20,9 +20,31 @@ RUN apk add --no-cache \
     wget \
     jq
 
+ENV ECR_CREDENTIAL_HELPER_VERSION 0.4.0
+RUN cd /usr/local/bin && \
+      wget https://amazon-ecr-credential-helper-releases.s3.us-east-2.amazonaws.com/${ECR_CREDENTIAL_HELPER_VERSION}/linux-amd64/docker-credential-ecr-login && \
+      chmod +x docker-credential-ecr-login
+
+ENV BUILDKIT_VERSION v0.7.2
+RUN cd /usr/local/bin && \
+      wget -nv https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz && \
+      tar --strip-components=1 -zxvf buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz bin/buildctl && \
+      chmod +x buildctl && \
+      rm -f buildkit-${BUILDKIT_VERSION}.linux-amd64.tar.gz
+
+USER shipitron
+ENV BUILDX_VERSION v0.4.2
+RUN cd /home/shipitron && \
+      wget -nv https://github.com/docker/buildx/releases/download/${BUILDX_VERSION}/buildx-${BUILDX_VERSION}.linux-amd64 && \
+      mkdir -p ~/.docker/cli-plugins && \
+      mv buildx-${BUILDX_VERSION}.linux-amd64 ~/.docker/cli-plugins/docker-buildx && \
+      chmod a+x ~/.docker/cli-plugins/docker-buildx
+
+USER root
+
 WORKDIR /app
 
-ENV SHIPITRON_VERSION=1.3.0
+ENV SHIPITRON_VERSION=1.3.1
 
 RUN gem install shipitron -v ${SHIPITRON_VERSION} && \
     mkdir -p /home/shipitron/.ssh && \

data/README.md

@@ -85,8 +85,9 @@ To release a new version:
 - Update the version number in `version.rb` and `Dockerfile.release` and commit the result.
 - `./build_dev.sh`
 - `docker run -it --rm -v ~/.gitconfig:/root/.gitconfig -v ~/.gitconfig.user:/root/.gitconfig.user -v ~/.ssh/id_rsa:/root/.ssh/id_rsa -v ~/.gem:/root/.gem -w /shipitron outstand/shipitron:dev rake release`
-- `docker build -t outstand/shipitron:VERSION -f Dockerfile.release .`
-- `docker push outstand/shipitron:VERSION`
-- `docker tag outstand/shipitron:VERSION outstand/shipitron:latest`
+- `VERSION=<version>`
+- `docker build -t outstand/shipitron:$VERSION -f Dockerfile.release .`
+- `docker push outstand/shipitron:$VERSION`
+- `docker tag outstand/shipitron:$VERSION outstand/shipitron:latest`
 - `docker push outstand/shipitron:latest`
 - Update ECS task definition with new version

data/lib/shipitron/git_info.rb

@@ -0,0 +1,57 @@
+require 'shipitron'
+require 'rugged'
+
+module Shipitron
+  class GitInfo < Hashie::Dash
+    property :sha
+    property :short_sha
+    property :email
+    property :name
+    property :summary
+    property :timestamp
+    property :branch
+    property :tag
+
+    def one_liner
+      "#{name} (#{short_sha}): #{summary}"
+    end
+
+    def self.from_path(path:)
+      repo = Rugged::Repository.new(path)
+      commit = repo.last_commit
+      self.new(
+        sha: commit.oid,
+        short_sha: commit.oid[0, 12],
+        email: commit.author.dig(:email),
+        name: commit.author.dig(:name),
+        summary: commit.summary,
+        timestamp: commit.epoch_time.to_s,
+        branch: branch_name(repo: repo),
+        tag: tag_name(repo: repo)
+      )
+    end
+
+    def self.branch_name(repo:)
+      ref = repo.head
+      ref.branch? ? ref.name.sub('refs/heads/', '') : nil
+    end
+
+    def self.tag_name(repo:)
+      ref = repo.head
+      tags = repo.tags
+
+      tags.each do |tag|
+        target_id =
+          if tag.annotated?
+            tag.annotation.target_id
+          else
+            tag.target.oid
+          end
+
+        return tag.name if ref.target_id == target_id
+      end
+
+      nil
+    end
+  end
+end

data/lib/shipitron/server/docker/build_image.rb

@@ -12,7 +12,7 @@ module Shipitron
 
         required :application
         required :docker_image
-        required :git_sha
+        required :git_info
         required :named_tag
         required :region
         optional :registry

data/lib/shipitron/server/docker/run_build_script.rb

@@ -9,7 +9,7 @@ module Shipitron
 
         required :application
         required :docker_image
-        required :git_sha
+        required :git_info
         required :named_tag
         optional :build_script, default: 'shipitron/build.sh'
         optional :registry
@@ -18,7 +18,7 @@ module Shipitron
           Logger.info 'Building docker image'
 
           docker_image.registry = registry if registry != nil
-          docker_image.tag = git_sha
+          docker_image.tag = git_info.short_sha
 
           FileUtils.cd("/home/shipitron/#{application}") do
             unless Pathname.new(build_script).exist?
@@ -43,8 +43,8 @@ module Shipitron
           context.docker_image
         end
 
-        def git_sha
-          context.git_sha
+        def git_info
+          context.git_info
         end
 
         def named_tag

data/lib/shipitron/server/git/clone_local_copy.rb

@@ -1,5 +1,6 @@
 require 'shipitron'
 require 'shellwords'
+require 'shipitron/git_info'
 
 module Shipitron
   module Server
@@ -22,10 +23,8 @@ module Shipitron
           end
 
           Logger.info 'Using this git commit:'
-          FileUtils.cd("/home/shipitron/#{application}") do
-            context.git_sha = `git rev-parse --short=12 HEAD`.chomp
-            Logger.info `git --no-pager log --format='%aN (%h): %s' -n 1`.chomp
-          end
+          context.git_info = GitInfo.from_path(path: "/home/shipitron/#{application}")
+          Logger.info context.git_info.one_liner
         end
 
         private

data/lib/shipitron/server/run_post_build.rb

@@ -9,6 +9,7 @@ module Shipitron
 
       required :region
       required :clusters
+      required :git_info
       optional :post_builds
 
       def call
@@ -26,7 +27,41 @@ module Shipitron
                 container_overrides: [
                   {
                     name: post_build.container_name,
-                    command: post_build.command_ary
+                    command: post_build.command_ary,
+                    environment: [
+                      {
+                        name: "GIT_SHA",
+                        value: git_info.sha
+                      },
+                      {
+                        name: "GIT_SHORT_SHA",
+                        value: git_info.short_sha
+                      },
+                      {
+                        name: "GIT_EMAIL",
+                        value: git_info.email
+                      },
+                      {
+                        name: "GIT_NAME",
+                        value: git_info.name
+                      },
+                      {
+                        name: "GIT_MESSAGE",
+                        value: git_info.summary
+                      },
+                      {
+                        name: "GIT_TIMESTAMP",
+                        value: git_info.timestamp
+                      },
+                      {
+                        name: "GIT_BRANCH",
+                        value: git_info.branch
+                      },
+                      {
+                        name: "GIT_TAG",
+                        value: git_info.tag
+                      }
+                    ]
                   }
                 ]
               },
@@ -75,6 +110,10 @@ module Shipitron
       def clusters
         context.clusters
       end
+
+      def git_info
+        context.git_info
+      end
     end
   end
 end

data/lib/shipitron/version.rb

@@ -1,3 +1,3 @@
 module Shipitron
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/shipitron.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'tty-table', '~> 0.9'
   spec.add_runtime_dependency 'pastel', '~> 0.7'
   spec.add_runtime_dependency 'excon', '~> 0.76'
+  spec.add_runtime_dependency 'rugged', '~> 1.0'
 
   spec.add_development_dependency "bundler", "~> 2.1"
   spec.add_development_dependency "rake", "~> 13.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shipitron
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Ryan Schlesinger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-08-27 00:00:00.000000000 Z
+date: 2020-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -192,6 +192,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.76'
+- !ruby/object:Gem::Dependency
+  name: rugged
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -285,6 +299,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".dockerignore"
+- ".gitattributes"
 - ".gitignore"
 - ".rspec"
 - Dockerfile
@@ -316,6 +331,7 @@ files:
 - lib/shipitron/ecs_task_def.rb
 - lib/shipitron/fetch_bucket.rb
 - lib/shipitron/find_docker_volume_name.rb
+- lib/shipitron/git_info.rb
 - lib/shipitron/logger.rb
 - lib/shipitron/mustache_yaml_parser.rb
 - lib/shipitron/parse_templates.rb