docker-template 0.2.0 → 0.3.0

data/lib/docker/template/rootfs.rb

@@ -1,22 +1,15 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2015 Jordon Bedwell - Apache v2.0 License
+# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Docker
   module Template
-    class Rootfs < Common
-      attr_reader :img
-      def initialize(repo)
-        @repo = repo
-      end
-
-      #
+    class Rootfs < Builder
+      extend Forwardable::Extended
 
-      def rootfs?
-        true
-      end
-
-      #
+      # ----------------------------------------------------------------------
 
       def data
         Template.get(:rootfs, {
@@ -24,50 +17,67 @@ module Docker
         })
       end
 
-      # In a typical situation we do not remove the rootfs img and don't
-      # recommend removing it as it's better cached by Docker, if you wish
-      # to delete it we will.  Now, here we only remove it if we get told
-      # to exit, since we will be in the middle of a build and probably
-      # not have tagged yet, unless we are downstream, we will remove
-      # it so you have no broken images on your system.
+      # ----------------------------------------------------------------------
+
+      def builder_data
+        tpl = "rootfs/#{@repo.metadata.rootfs_template}"
+        erb = @repo.root.join("rootfs.erb")
+
+        Template.get(
+          erb.file?? erb : tpl, {
+            :metadata => @repo.metadata
+          }
+        )
+      end
+
+      # ----------------------------------------------------------------------
+      # During a simple copy you store all the data (including rootfs) data
+      # as a single unit, this helps us clean up data that is known to be for
+      # just the rootfs image and remove it so it doesn't impact.
+      # ----------------------------------------------------------------------
+
+      def simple_cleanup(dir)
+        file = dir.join("usr/local/bin/mkimg")
+
+        if file.exist?
+          then file.delete
+        end
+      end
+
+      # ----------------------------------------------------------------------
 
-      def unlink(img: true)
-        keep = @repo.metadata["keep_rootfs"]
-        @img.delete "force" => true if img && @img && !keep
+      def teardown(img: true)
         @context.rmtree if @context && @context.directory?
-      rescue Docker::Error::NotFoundError
-        nil
+        @img.delete "force" => true if @img && img \
+          rescue nil
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def setup_context
         @context = @repo.tmpdir("rootfs")
-        @context.join("Dockerfile").write(data)
         @copy = @context.join(@repo.metadata["copy_dir"])
-        @copy.mkdir
+        @context.join("Dockerfile").write(data)
+
+        @copy.join("usr/local/bin").mkdir_p
+        @copy.join("usr/local/bin/mkimg").write(builder_data)
+        @copy.join("usr/local/bin/mkimg").chmod(0755)
         copy_rootfs
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def copy_rootfs
-        dir = @repo.copy_dir("rootfs")
-        Util::Copy.new(dir, @copy).directory
-      rescue Errno::ENOENT => error_
-        if error_.message !~ /\/(copy|rootfs)\Z/
-          raise error_ else raise Error::NoRootfsCopyDir
-        end
-      end
+        dir = @repo.copy_dir(
+          "rootfs"
+        )
 
-      #
-
-      private
-      def verify_context
-        unless @copy.join("usr/local/bin/mkimg").file?
-          raise Error::NoRootfsMkimg
+        if dir.exist?
+          @repo.copy_dir("rootfs").safe_copy(@copy, {
+            :root => Template.root
+          })
         end
       end
     end

data/lib/docker/template/scratch.rb

@@ -1,35 +1,49 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2015 Jordon Bedwell - Apache v2.0 License
+# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Docker
   module Template
-    class Scratch < Common
-      attr_reader :rootfs, :img, :repo
-      def initialize(repo)
-        @repo = repo
+    class Scratch < Builder
+      attr_reader :rootfs
+
+      # ----------------------------------------------------------------------
+
+      def initialize(*args)
+        super; @rootfs = Rootfs.new(
+          repo
+        )
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       def data
         Template.get(:scratch, {
-          :maintainer => @repo.metadata["maintainer"],
-          :entrypoint => @repo.metadata["entry"].fallback,
+          :entrypoint => @repo.metadata.entry,
+          :maintainer => @repo.metadata.maintainer,
           :tar_gz => @tar_gz.basename
         })
       end
 
-      #
+      # ----------------------------------------------------------------------
+
+      def teardown(img: false)
+        @copy.rm_rf if @copy
+        @context.rm_rf if @context
+        @tar_gz.rm_rf if @tar_gz
 
-      def unlink(img: false)
-        @copy.rmtree if @copy && @copy.directory?
-        @img.delete "force" => true if @img && img
-        @context.rmtree if @context && @context.directory?
-        @tar_gz.unlink if @tar_gz && @tar_gz.file?
+        if @img && img
+          then @img.delete({
+            "force" => true
+          })
+        end
+      rescue Docker::Error::NotFoundError
+        nil
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def setup_context
@@ -39,96 +53,112 @@ module Docker
         copy_dockerfile
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
-      def build_rootfs
-        @rootfs ||= begin
-          self.class.rootfs_for(@repo)
-        end
+      def copy_dockerfile
+        data = self.data % @tar_gz.basename
+        dockerfile = @context.join("Dockerfile")
+        dockerfile.write(data)
       end
 
-      # Caches and builds the master rootfs for repos, this is cached
-      # on the class because it could be used many times in a single build
-      # so we make sure to keep it around so you don't have tons of
-      # replication going about slowing down all of the builds.
+      # ----------------------------------------------------------------------
 
-      def self.rootfs_for(repo)
-        (@rootfs ||= {})[repo.name] ||= begin
-          Rootfs.new(repo).tap(&:build)
+      def copy_cleanup
+        @rootfs.simple_cleanup(
+          @copy
+        )
+      end
+
+      # ----------------------------------------------------------------------
+
+      def verify_context
+        if @repo.buildable? && @tar_gz.zero?
+          raise Error::InvalidTargzFile, @tar_gz
         end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def build_context
-        build_rootfs
+        return unless @repo.buildable?
+        @rootfs.build
 
-        output_given = false
         img = Container.create(create_args)
-        img.start(start_args).attach do |type, str|
-          type == :stdout ? $stdout.print(str) : $stderr.print(Ansi.red(str))
-          output_given = true
-        end
+        img.start(start_args).attach(logger_opts, &Logger.new.method(logger_type))
+        status = img.json["State"]["ExitCode"]
 
-        # NOTE: Sometimes the instance exists too quickly for attach to even
-        # work, through the remote API, so we need to detect those situations
-        # and stream the logs after it's exited if we have given no output,
-        # we want you to always get the output that was given.
-
-        unless output_given
-          img.streaming_logs "stdout" => true, "stderr" => true do |type, str|
-            type == :stdout ? $stdout.print(str) : $stderr.print(Ansi.red(str))
-          end
-        end
-
-        if (status = img.json["State"]["ExitCode"]) != 0
+        if status != 0
           raise Error::BadExitStatus, status
         end
       ensure
-        img.tap(&:stop).delete("force" => true) if img
+        @rootfs.teardown
+
+        if img
+          then img.tap(&:stop).delete({
+            "force" => true
+          })
+        end
       end
 
-      #
+      # ----------------------------------------------------------------------
 
-      def verify_context
-        unless @tar_gz.size > 0
-          raise Error::InvalidTargzFile, @tar_gz
-        end
+      private
+      def logger_type
+        @repo.metadata["tty"] ? :tty : :simple
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
-      def copy_dockerfile
-        data = self.data % @tar_gz.basename
-        dockerfile = @context.join("Dockerfile")
-        dockerfile.write(data)
+      def logger_opts
+        return {
+          :tty => @repo.metadata["tty"], :stdout => true, :stderr => true
+        }
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def create_args
-        {
-          "Env"     => @repo.to_env_hash(tar_gz: @tar_gz, copy_dir: @copy).to_env_ary,
-          "Name"    => ["rootfs", @repo.name, @repo.tag, "image"].join("-"),
+        name = ["rootfs", @repo.name, @repo.tag, "image"].join("-")
+        env  = @repo.to_env(:tar_gz => @tar_gz, :copy_dir => @copy)
+
+        return {
+          "Env"     => env.to_a,
+          "Tty"     => @repo.metadata["tty"],
           "Image"   => @rootfs.img.id,
+          "Name"    => name,
+
+          "HostConfig" => {
+            "Binds" => [
+              "#{@copy}:#{@copy}", "#{@tar_gz}:#{@tar_gz}"
+            ]
+          },
+
           "Volumes" => {
-            @tar_gz.to_s => {}, @copy.to_s => {}
+            @copy.to_s   => {
+              "source" => @copy.to_s,
+              "destination" => @copy.to_s
+            },
+
+            @tar_gz.to_s => {
+              "source" => @tar_gz.to_s,
+              "destination" => @tar_gz.to_s
+            }
           }
         }
       end
 
-      #
+      # ----------------------------------------------------------------------
 
       private
       def start_args
         {
-          "Binds" => [
-            "#{@copy}:#{@copy}:ro", "#{@tar_gz}:#{@tar_gz}"
-          ]
+          # "Binds" => [
+          #   "#{@copy}:#{@copy}", "#{@tar_gz}:#{@tar_gz}"
+          # ]
         }
       end
     end

data/lib/docker/template/version.rb

@@ -1,9 +1,11 @@
+# ----------------------------------------------------------------------------
 # Frozen-string-literal: true
-# Copyright: 2015 Jordon Bedwell - Apache v2.0 License
+# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
 # Encoding: utf-8
+# ----------------------------------------------------------------------------
 
 module Docker
   module Template
-    VERSION = "0.2.0"
+    VERSION = "0.3.0"
   end
 end

data/lib/erb/context.rb

@@ -0,0 +1,29 @@
+# ----------------------------------------------------------------------------
+# Frozen-string-literal: true
+# Copyright: 2015 - 2016 Jordon Bedwell - Apache v2.0 License
+# Encoding: utf-8
+# ----------------------------------------------------------------------------
+
+require "erb"
+class ERB
+  class Context
+
+    # ------------------------------------------------------------------------
+    # Wraps any data you wish to send to ERB limiting it's context access.
+    # ------------------------------------------------------------------------
+
+    def initialize(vars)
+      vars.each do |key, val|
+        instance_variable_set("@#{key}", val)
+      end
+    end
+
+    # ------------------------------------------------------------------------
+    # Returns the binding so that we can ship it off and give it to ERB.
+    # ------------------------------------------------------------------------
+
+    def _binding
+      return binding
+    end
+  end
+end

data/shas.yml

@@ -0,0 +1,11 @@
+alpine:
+  apk_tools:
+    3.3: { package: apk-tools-static-2.6.5-r1.apk, sha: 03162d70e6d42eea77624a8da76d69e665ca19aa834361c3652414f111884636 }
+    3.2: { package: apk-tools-static-2.6.3-r0.apk, sha: ee5f42e06731c7447ce8fae99116a637f261e24f67826ca81dbe60ffbdb5c40e }
+
+  apk_keys:
+    3.3: { package: alpine-keys-1.1-r0.apk, sha: bd1f365f1dbda97e02fceb86fe4ff7e220f31ecc9debfd2a0c43764b45d31d0e }
+    3.2: { package: alpine-keys-1.1-r0.apk, sha: 26e9296d789fd4cae7392a067bed480b502d4302bcb7289d699af42c100622eb }
+
+ubuntu:
+  signing_key_sha: ""

data/templates/rootfs.erb

@@ -0,0 +1,5 @@
+FROM <%= @rootfs_base_img %>
+COPY copy /
+ENTRYPOINT [ \
+  "/usr/local/bin/mkimg" \
+]

data/templates/rootfs/alpine.erb

@@ -0,0 +1,71 @@
+#!/bin/sh
+[ "$DEBUG" ] && set -x
+set -e
+
+arch=$(uname -i)
+rootfs=$(mktemp -d)
+tmp=$(mktemp -d)
+
+mirrors="\nhttp://dl-1.alpinelinux.org/alpine/v<%= @metadata.release %>/main"
+mirrors=$mirrors"\nhttp://dl-2.alpinelinux.org/alpine/v<%= @metadata.release %>/main"
+mirrors=$mirrors"\n@testing http://dl-3.alpinelinux.org/alpine/edge/testing"
+mirrors=$mirrors"\n@testing http://dl-4.alpinelinux.org/alpine/edge/testing"
+release_url="http://nl.alpinelinux.org/alpine/v<%= @metadata.release %>/main"
+testing_url="http://nl.alpinelinux.org/alpine/edge/testing"
+
+tar_ignore() {
+  sed -r "/tar: Ignoring unknown extended header/d"
+}
+
+apt-get update && apt-get install --no-install-recommends -y wget
+<% sha1 = @metadata._shas[:alpine][:apk_keys ][@metadata.tag].sha %>
+<% pkg1 = @metadata._shas[:alpine][:apk_keys ][@metadata.tag].package %>
+<% pkg2 = @metadata._shas[:alpine][:apk_tools][@metadata.tag].package %>
+<% sha2 = @metadata._shas[:alpine][:apk_tools][@metadata.tag].sha %>
+for v in <%= sha1 %>:<%= pkg1 %> <%= sha2 %>:<%= pkg2 %>; do
+  sha=$(echo $v | awk -F: '{ print $1 }')
+  pkg=$(echo $v | awk -F: '{ print $2 }')
+  wget -nv -O $tmp/$pkg $release_url/$arch/$pkg
+  if [ "$(sha256sum $tmp/$pkg)" != "$sha  $tmp/$pkg" ]; then
+    >&2 printf "%s sha error: %s" $pkg \
+      "$(sha256sum $tmp/$pkg)"
+    exit 1
+  fi
+done
+
+tar xzf $tmp/alpine-keys-*.apk -C $tmp etc/ 2>&1 | tar_ignore
+tar xzf $tmp/apk-tools-static-*.apk -C $tmp sbin/apk.static 2>&1 | tar_ignore
+$tmp/sbin/apk.static --keys-dir=$tmp/etc/apk/keys --initdb --root=$rootfs \
+  --repository=$release_url --update-cache add apk-tools busybox \
+      libc-utils alpine-baselayout alpine-keys musl
+
+cd $tmp
+$tmp/sbin/apk.static --keys-dir=$tmp/etc/apk/keys --root=$rootfs --repository=$release_url --update fetch alpine-base
+tar xzf $tmp/alpine-base-*.apk -C $rootfs etc/ 2>&1 | tar_ignore
+cd -> /dev/null
+
+cp -R $COPY_DIR/* $rootfs 2> /dev/null || true
+mkdir -p $rootfs/etc/startup1.d
+mkdir -p $rootfs/etc/startup2.d
+mkdir -p $rootfs/etc/startup3.d
+mkdir -p $rootfs/etc/shutdown.d
+
+cp /etc/hosts $rootfs/etc/hosts
+cp /etc/resolv.conf $rootfs/etc/resolv.conf
+printf "$mirrors" > $rootfs/etc/apk/repositories
+<% if @metadata.pkgs?  %>chroot $rootfs sh -ec "apk --update add <%= @metadata.pkgs %>"<% end %>
+<% if @metadata.packages?  %>chroot $rootfs sh -ec "apk --update add <%= @metadata.packages %>"<% end %>
+<% if @metadata.package_cleanup?  %>chroot $rootfs sh -ec "apk del <%= @metadata.package_cleanup %>"<% end %>
+<% if @metadata.pkg_cleanup?  %>chroot $rootfs sh -ec "apk del <%= @metadata.pkg_cleanup %>"<% end %>
+chroot $rootfs sh -ec '{
+	mv /var/run/* /run 2> /dev/null || true
+	mv /var/lock  /run 2> /dev/null || true
+	rm -rf /var/run /var/lock
+	ln -s /run/lock /var/lock
+	ln -s /run /var/run
+}'
+
+rm -rf $rootfs/etc/hosts
+rm -rf $rootfs/etc/resolv.conf
+docker-helper cleanup $rootfs
+tar -zf $TAR_GZ --numeric-owner -C $rootfs -c .