docker-template 0.2.0 → 0.3.0

data/templates/rootfs/ubuntu.erb

@@ -0,0 +1,76 @@
+#!/bin/sh
+[ "$DEBUG" ] && set -x
+set -e
+
+arch=$(uname -i)
+rootfs=$(mktemp -d)
+partner_url="https://partner-images.canonical.com/core"
+dpkg_arch=$(dpkg --print-architecture)
+tmp=$(mktemp -d)
+
+cd $tmp
+gpg  --keyserver keyserver.ubuntu.com --recv-keys 7db87c81
+sudo apt-get update && sudo apt-get install --no-install-recommends -y wget
+wget -nv $partner_url/<%= @metadata.release %>/current/SHA256SUMS.gpg
+wget -nv $partner_url/<%= @metadata.release %>/current/SHA256SUMS
+gpg --verify SHA256SUMS.gpg SHA256SUMS
+
+img=$(cat SHA256SUMS | grep "$dpkg_arch" | awk -F' *' '{ print $2 }' | sed -r 's/^\*//')
+sha=$(cat SHA256SUMS | grep "$dpkg_arch" | awk -F' *' '{ print $1 }')
+
+wget -nv "$partner_url/<%= @metadata.release %>/current/$img"
+if [ "$(sha256sum $img | awk '{ print $1 }')" != "$sha" ]; then
+	echo "Bailing, the SHA256sum did not match."
+fi
+
+tar xzf $img -C $rootfs
+cd -> /dev/null
+
+rm -rf $rootfs/etc/hosts
+rm -rf $rootfs/etc/resolv.conf
+cp /etc/resolv.conf $rootfs/etc/resolv.conf
+cp /etc/hosts $rootfs/etc/hosts
+
+chroot "$rootfs" sh -ec "{
+	dpkg-divert --local --rename --add /sbin/initctl
+	dpkg-divert --local --rename --add /usr/sbin/update-rc.d
+	ln -s /bin/true /usr/sbin/update-rc.d
+	ln -s /bin/true /sbin/initctl
+}"
+
+chroot "$rootfs" sh -ec "{
+	sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
+	echo \"debconf debconf/frontend select Noninteractive\" | debconf-set-selections
+	echo 'Dpkg::Options { \"--force-confdef\"; \"--force-confold\"; }' > /etc/apt/apt.conf.d/local
+	echo \"exit 101\" > /usr/sbin/policy-rc.d policy-rc.d
+	sed -ri '/^(deb-src\s+|$|#)/d' /etc/apt/sources.list
+	chmod uog+x /usr/sbin/policy-rc.d
+
+	apt-get update
+	apt-get dist-upgrade -yf
+	apt-get install --no-install-recommends -yf \
+		locales deborphan
+
+  apt-get autoremove --purge $REMOVE -yf
+  apt-get autoremove --purge \$(deborphan --guess-all) deborphan -yf
+  <% if @metadata.pkgs?  %>apt-get install --no-install-recommends -y <%= @metadata.pkgs %><% end %>
+  <% if @metadata.packages?  %>apt-get install --no-install-recommends -y <%= @metadata.packages %><% end %>
+  <% if @metadata.package_cleanup?  %>apt-get autoremove --purge -y <%= @metadata.package_cleanup %><% end %>
+  <% if @metadata.pkg_cleanup?  %>apt-get autoremove --purge -y <%= @metadata.pkg_cleanup %><% end %>
+  apt-get autoremove --purge
+	apt-get autoclean
+	apt-get clean
+
+	rm -rf /tmp/remove
+}"
+
+cp -R $COPY_DIR/* $rootfs
+mkdir -p $rootfs/etc/startup1.d
+mkdir -p $rootfs/etc/startup2.d
+mkdir -p $rootfs/etc/startup3.d
+mkdir -p $rootfs/etc/shutdown.d
+
+rm -rf $rootfs/etc/hosts
+rm -rf $rootfs/etc/resolv.conf
+docker-helper cleanup $rootfs
+tar -zf $TAR_GZ --numeric-owner -C $rootfs -c .

data/{lib/docker/template/templates → templates}/scratch.erb

@@ -1,6 +1,5 @@
 FROM scratch
 MAINTAINER <%= @maintainer %>
-ENV TERM=xterm
 ADD <%= @tar_gz %> /
 <% if @entrypoint %>
   ENTRYPOINT ["<%= @entrypoint %>"]

metadata

@@ -1,85 +1,113 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-03 00:00:00.000000000 Z
+date: 2016-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: docker-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.23'
+        version: '1.28'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.28'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: simple-ansi
+  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.23'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: luna-rspec-formatters
+  name: pathutil
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
+        version: '0.7'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '0.7'
 - !ruby/object:Gem::Dependency
-  name: envygeeks-coveralls
+  name: extras
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
+        version: '0.1'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
+        version: '1.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.8'
 description: Build and template awesome Docker images a variety of ways.
 email:
 - jordon@envygeeks.io
@@ -93,43 +121,29 @@ files:
 - README.md
 - Rakefile
 - bin/docker-template
+- comp/bin
+- comp/list
+- comp/list.pak
 - lib/docker/template.rb
-- lib/docker/template/alias.rb
-- lib/docker/template/ansi.rb
-- lib/docker/template/auth.rb
-- lib/docker/template/common.rb
-- lib/docker/template/config.rb
+- lib/docker/template/builder.rb
+- lib/docker/template/cache.rb
+- lib/docker/template/cli.rb
 - lib/docker/template/error.rb
-- lib/docker/template/error/bad_exit_status.rb
-- lib/docker/template/error/bad_repo_name.rb
-- lib/docker/template/error/invalid_repo_type.rb
-- lib/docker/template/error/invalid_targz_file.rb
-- lib/docker/template/error/no_rootfs_copy_dir.rb
-- lib/docker/template/error/no_rootfs_mkimg.rb
-- lib/docker/template/error/no_setup_context_found.rb
-- lib/docker/template/error/not_implemented.rb
-- lib/docker/template/error/repo_not_found.rb
-- lib/docker/template/interface.rb
+- lib/docker/template/logger.rb
 - lib/docker/template/metadata.rb
+- lib/docker/template/normal.rb
+- lib/docker/template/notify.rb
 - lib/docker/template/parser.rb
-- lib/docker/template/patches.rb
-- lib/docker/template/patches/array.rb
-- lib/docker/template/patches/hash.rb
-- lib/docker/template/patches/object.rb
-- lib/docker/template/patches/pathname.rb
-- lib/docker/template/patches/string.rb
 - lib/docker/template/repo.rb
 - lib/docker/template/rootfs.rb
-- lib/docker/template/routable.rb
 - lib/docker/template/scratch.rb
-- lib/docker/template/simple.rb
-- lib/docker/template/stream.rb
-- lib/docker/template/templates/rootfs.erb
-- lib/docker/template/templates/scratch.erb
-- lib/docker/template/util.rb
-- lib/docker/template/util/copy.rb
-- lib/docker/template/util/data.rb
 - lib/docker/template/version.rb
+- lib/erb/context.rb
+- shas.yml
+- templates/rootfs.erb
+- templates/rootfs/alpine.erb
+- templates/rootfs/ubuntu.erb
+- templates/scratch.erb
 homepage: http://github.com/envygeeks/docker-template/
 licenses:
 - MIT
@@ -142,7 +156,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -150,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.0
+rubygems_version: 2.6.3
 signing_key: 
 specification_version: 4
 summary: Build and template Docker images a variety of ways.

data/lib/docker/template/alias.rb

@@ -1,28 +0,0 @@
-module Docker
-  module Template
-    class Alias
-      def initialize(aliased)
-        @aliased = aliased
-      end
-
-      #
-
-      def build
-        Util.notify_alias(@aliased)
-        prebuild unless @aliased.parent_img
-        @aliased.parent_img.tag(@aliased.repo.to_tag_h)
-        @aliased.push
-      end
-
-      #
-
-      private
-      def prebuild
-        repo   = @aliased.parent_repo
-        simple = @aliased.repo.type == "simple"
-        @aliased.class.new(repo, @aliased.rootfs_img) unless simple
-        @aliased.class.new(repo).build if simple
-      end
-    end
-  end
-end

data/lib/docker/template/ansi.rb

@@ -1,85 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2015 Jordon Bedwell - Apache v2.0 License
-# Encoding: utf-8
-
-module Docker
-  module Template
-    module Ansi
-      module_function
-
-      ESCAPE = format("%c", 27)
-      MATCH = /#{ESCAPE}\[(?:\d+)(?:;\d+)*(j|k|m|s|u|A|B|G)|\e\(B\e\[m/ix.freeze
-      COLORS = {
-        :red => 31,
-        :green => 32,
-        :black => 30,
-        :magenta => 35,
-        :yellow => 33,
-        :white => 37,
-        :blue => 34,
-        :cyan => 36
-      }
-
-      # Strip ANSI from the current string.  It also strips cursor stuff,
-      # well some of it, and it also strips some other stuff that a lot of
-      # the other ANSI strippers don't.
-
-      def strip(str)
-        str.gsub MATCH, ""
-      end
-
-      # Reset the vterm view if it's supported.  Depending on how badly
-      # your vterm is implemented it might reset rather than clear scrollback
-      # with a few empty lines added on the top.
-
-      def clear
-        $stdout.print(format("%c[H%c[2J", 27, 27))
-      end
-
-      #
-
-      def has?(str)
-        !!(str =~ MATCH)
-      end
-
-      # Jump the cursor up and then back down or just up and down.  This is
-      # useful when streaming async downloads from something like Docker.  It
-      # also works better than using `tput`
-
-      def jump(str = "", up: nil, down: nil, both: nil)
-        str = clear_line(str)
-
-        return format("%c[%dA%s%c[%dB", 27, up || both, str, 27, down || both) if (up && down) || both
-        up ? format("%c[%dA%s", 27, up, str) : format("%s%c[%dB", str, 27, down)
-      end
-
-      # Reset the color back to the default color so that you do not leak any
-      # colors when you move onto the next line. This is probably normally
-      # used as part of a wrapper so that we don't leak colors.
-
-      def reset(str = "")
-        @ansi_reset ||= format("%c[0m", 27)
-        "#{@ansi_reset}#{str}"
-      end
-
-      #
-
-      def clear_line(str = "")
-        @ansi_clear_line ||= format("%c[2K\r", 27)
-        "#{@ansi_clear_line}#{str}\r"
-      end
-
-      # SEE: `self::COLORS` for a list of methods.  They are mostly
-      # standard base colors supported by pretty much any xterm-color, we do
-      # not need more than the base colors so we do not include them.
-      # Actually... if I'm honest we don't even need most of the
-      # base colors.
-
-      COLORS.each do |color, num|
-        define_method color do |str|
-          "#{format("%c", 27)}[#{num}m#{str}#{reset}"
-        end; module_function color
-      end
-    end
-  end
-end

data/lib/docker/template/auth.rb

@@ -1,25 +0,0 @@
-module Docker
-  module Template
-    module Auth
-      module_function
-
-      def auth!
-        return unless login = credentials
-        login["auths"].each do |server, auth|
-          username, password = Base64.decode64(auth["auth"]).split(":", 2)
-          Docker.authenticate!({
-            "username" => username,
-            "serveraddress" => server,
-            "email" => auth["email"],
-            "password" => password
-          })
-        end
-      end
-
-      def credentials
-        path = Pathname.new("~/.docker/config.json").expand_path
-        JSON.parse(path.read) if path.exist?
-      end
-    end
-  end
-end

data/lib/docker/template/common.rb

@@ -1,130 +0,0 @@
-# Frozen-string-literal: true
-# Copyright: 2015 Jordon Bedwell - Apache v2.0 License
-# Encoding: utf-8
-
-module Docker
-  module Template
-    class Common
-      CopyMethods = [
-        :setup_context, :copy_global,
-        :copy_all, :copy_type, :copy_tag, :build_context,
-        :verify_context].freeze
-
-      def push
-        return if rootfs? || !Interface.push?
-
-        Auth.auth!
-        img = @img || Docker::Image.get(@repo.to_s)
-        logger = Stream.new.method(:log)
-        img.push(&logger)
-      end
-
-      #
-
-      def aliased?
-        @repo.tag != @repo.aliased && !rootfs?
-      end
-
-      #
-
-      def rootfs?
-        false
-      end
-
-      #
-
-      def parent_repo
-        return false unless aliased?
-        @parent_repo ||= begin
-          Repo.new(@repo.to_h.merge("tag" => @repo.aliased))
-        end
-      end
-
-      #
-
-      def parent_img
-        return false unless aliased?
-        @parent_img ||= Docker::Image.get(parent_repo.to_s)
-      rescue Docker::Error::NotFoundError
-        if aliased?
-          nil
-        end
-      end
-
-      #
-
-      def build
-        return Alias.new(self).build if aliased?
-
-        Ansi.clear
-        Util.notify_build(@repo, rootfs: rootfs?)
-        copy_build_and_verify
-        chdir_build
-      rescue SystemExit => exit_
-        unlink img: true
-        raise exit_
-      ensure
-        if rootfs?
-          unlink img: false else unlink
-        end
-      end
-
-      #
-
-      def chdir_build
-        Dir.chdir(@context) do
-          @img = Docker::Image.build_from_dir(".", &Stream.new.method(:log))
-          @img.tag rootfs?? @repo.to_rootfs_h : @repo.to_tag_h
-          push
-        end
-      end
-
-      #
-
-      private
-      def copy_build_and_verify
-        unless respond_to?(:setup_context, true)
-          raise Error::NoSetupContextFound
-        end
-
-        CopyMethods.each do |val|
-          send(val) if respond_to?(val, true)
-        end
-      end
-
-      private
-      def copy_tag
-        return if rootfs?
-        dir = @repo.copy_dir("tag", @repo.tag)
-        Util::Copy.directory(dir, @copy)
-      end
-
-      #
-
-      private
-      def copy_global
-        return if rootfs?
-        dir = Template.root.join(@repo.metadata["copy_dir"])
-        Util::Copy.directory(dir, @copy)
-      end
-
-      #
-
-      private
-      def copy_type
-        return unless !rootfs? && build_type = @repo.metadata["tags"][@repo.tag]
-        dir = @repo.copy_dir("type", build_type)
-        Util::Copy.directory(dir, @copy)
-      end
-
-      #
-
-      private
-      def copy_all
-        return if rootfs?
-        dir = @repo.copy_dir("all")
-        Util::Copy.directory(dir, @copy)
-      end
-    end
-  end
-end