docker-template 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ffcb35889c09b22bd18672e20c7907578b5fe2d
-  data.tar.gz: fe154a23ec45528f19325612c305edd860586eac
+  metadata.gz: 51e598d8ac190602aa8f10f7fcb75e6de30e28f0
+  data.tar.gz: 07f80e7e207f57f87cd189a424167a47bbc1779f
 SHA512:
-  metadata.gz: 2dddf6ae46fb045aeaec2868e86952334980d608068f3028cd00627a84cd0b03a1e5ca9ba907370f250f1d44bc8d642805cb5ede26f78ea8e2e513ff6eba3630
-  data.tar.gz: 8393414493d0e7754c05acc1b27f6d1cae0f210ac60258ef94265dc496a2be86873f21ffa0648809f8f8f247d445ba56be7cbbcb5873f1ce6b5726674d6bd7fa
+  metadata.gz: 0479a7b685bde364749bf5ec448dcc54e3ef3ca73c05dc13b50b5e8d1dd14ce26a425190c3b948c85de5c55f778ceb5ee9e680b7bec5909e73c943459bedf229
+  data.tar.gz: 4dde50801034387b9071eaa670dd9e5e52f4744599cabe6d2616c786f6b3176033ffdd6fd87d884006202b3c38c7d4b870115ef27567cdcd34bb6434bf92e9fd

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.12.0"
+    VERSION = "0.13.0"
   end
 end

data/templates/rootfs/alpine.erb

@@ -8,7 +8,7 @@ TMPDIR=$(mktemp -d)
 MIRROR_HOST="<%= @meta.mirror_host %>"
 [ "$MIRROR_HOST" ] || MIRROR_HOST="mirror.envygeeks.io"
 MIRRORS="\nhttp://$MIRROR_HOST/alpine/<%= @meta.release =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/main"
-MIRRORS=$MIRRORS"\n@community http://$MIRROR_HOST/alpine/edge/community"
+MIRRORS=$MIRRORS"\n@community http://$MIRROR_HOST/alpine/<%= @meta.release =~ /^[\d,\.]+$/ ? "v" : "" %>/community"
 MIRRORS=$MIRRORS"\n@testing http://$MIRROR_HOST/alpine/edge/testing"
 RELEASE_URL="http://$MIRROR_HOST/alpine/<%= @meta.release \
   =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/main"

data/templates/rootfs/ubuntu.erb

@@ -3,7 +3,9 @@
 set -e
 
 ROOTFS=$(mktemp -d)
-PARTNER_URL="https://partner-images.canonical.com/core"
+MIRROR_HOST="<%= @meta.mirror_host %>"
+[ "$MIRROR_HOST" ] || MIRROR_HOST="archive.ubuntu.com"
+PARTNER_URL="https://mirror.envygeeks.io/core-ubuntu"
 TMP=$(mktemp -d)
 
 # --
@@ -15,8 +17,8 @@ apk --update add wget gnupg ca-certificates \
 # --
 
 gpg --keyserver keyserver.ubuntu.com --recv-keys 1A5D6C4C7DB87C81
-wget $PARTNER_URL/<%= @meta.release %>/current/SHA256SUMS.gpg
-wget $PARTNER_URL/<%= @meta.release %>/current/SHA256SUMS
+wget $PARTNER_URL/<%= @meta.release %>/SHA256SUMS.gpg
+wget $PARTNER_URL/<%= @meta.release %>/SHA256SUMS
 gpg --verify SHA256SUMS.gpg SHA256SUMS
 
 cat SHA256SUMS
@@ -24,7 +26,7 @@ sha=$(cat SHA256SUMS | grep "amd64" | awk -F' *' '{ print $1 }')
 img=$(cat SHA256SUMS | grep "amd64" | awk -F' *' '{ print $2 }' \
 	| sed -r 's/^\*//')
 
-wget --progress=bar "$PARTNER_URL/<%= @meta.release %>/current/$img"
+wget --progress=bar "$PARTNER_URL/<%= @meta.release %>/$img"
 if [ "$(sha256sum $img | awk '{ print $1 }')" != "$sha" ]; then
 	echo "Bailing, the SHA256sum did not match."
 fi
@@ -43,26 +45,29 @@ 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 "dpkg-divert --local --rename --add /sbin/initctl"
+chroot "$ROOTFS" sh -ec "dpkg-divert --local --rename --add /usr/sbin/update-rc.d"
+ln -s /bin/true $ROOTFS/usr/sbin/update-rc.d
+ln -s /bin/true $ROOTFS/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/03confdef
-	echo 'APT::Get::Install-Recommends \"false\"; APT::Get::Install-Suggests \"false\";' > /etc/apt/apt.conf.d/00norecommends
-	echo 'APT::Get::Assume-Yes \"true\"; APT::Get::force-yes \"true\";' > /etc/apt/apt.conf.d/01yes
-	echo 'Apt::Get::Purge \"true\";' > /etc/apt/apt.conf.d/02purge
-	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
+sed -i 's/^#\s*\(deb.*universe\)$/\1/g' $ROOTFS/etc/apt/sources.list
+sed -i "s/archive\.ubuntu\.com/$MIRROR_HOST/g" $ROOTFS/etc/apt/sources.list
+chroot "$ROOTFS" sh -ec 'echo "debconf debconf/frontend select Noninteractive" | debconf-set-selections'
+echo 'Dpkg::Options { "--force-confdef"; "--force-confold"; }' > $ROOTFS/etc/apt/apt.conf.d/03confdef
+echo 'APT::Get::Install-Recommends "false"; APT::Get::Install-Suggests "false";' > \
+	$ROOTFS/etc/apt/apt.conf.d/00norecommends
+
+# --
+
+echo "exit 101" > $ROOTFS/usr/sbin/policy-rc.d policy-rc.d
+echo 'APT::Get::Assume-Yes "true";' > $ROOTFS/etc/apt/apt.conf.d/01yes
+echo 'Apt::Get::Purge "true";' > $ROOTFS/etc/apt/apt.conf.d/02purge
+sed -ri '/^(deb-src\s+|$|#)/d' $ROOTFS/etc/apt/sources.list
+chmod uog+x $ROOTFS/usr/sbin/policy-rc.d
 
+chroot "$ROOTFS" sh -ec "{
 	apt-get update
   apt-get install locales deborphan <%= @meta.packages %>
   echo 'Yes, do as I say!' | SUDO_FORCE_REMOVE=yes apt-get autoremove -f <%= @meta.package_cleanup %>
@@ -78,19 +83,12 @@ chroot "$ROOTFS" sh -ec "{
 # --
 
 <% if @meta.helpers? %>
-	chroot $ROOTFS sh -ec '{
-	  mkdir -p /usr/src
-	  cd /usr/src
-
-		apt-get update
-		apt-get install --no-install-recommends -yf git ca-certificates
-	  git clone https://github.com/envygeeks/docker-helper.git
-	  cp -R docker-helper/src/* /
-	  rm -rf /usr/src/*
-
-		apt-get autoremove --purge \
-			git ca-certificates -yf
-	}'
+  mkdir -p /usr/src
+  cd /usr/src
+
+  apk --update add ca-certificates git
+  git clone --verbose https://github.com/envygeeks/docker-helper.git
+  cp -R docker-helper/src/* $ROOTFS/
 <% end %>
 
 # --

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Jordon Bedwell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-10 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor