docker-template 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a185a9ae1813e75fe6700ad37d1afddddb7abb9d
-  data.tar.gz: 23469cd0a8a12e6a574f2fc31bd796205f94e895
+  metadata.gz: 5060791217036cf86cc67c35c8ab1e704b3f267c
+  data.tar.gz: b938025a0acb248c6d4d61af6fac0fbadf93d09d
 SHA512:
-  metadata.gz: 974e06e36e2177a5372a11e258d24a21c538265d1aeca88387ad1d5a9c41fec46d7272eedf29805a8dbafe6abaa3e97c15fbbd224efaffebe611a01e7866557d
-  data.tar.gz: e9ef4a69ba9423ac09f089d45160c2969797016ccbd2cf0e14e15df8dde0b96f472ce5828ef89783e9b5b12b26f5d2f0f2e7d0b471d7a21fa6db43144c91827e
+  metadata.gz: 608e74b78188be05ad57b1c700320e8457e07544baa95a357c7c6cc48cb829e0d62ca328f3b964e671307f982d9cb2c73dca40ef1ad005761fc50b3f0d007785
+  data.tar.gz: 871506fd6725da0fc6d82506201540dda1fdfe6dcd9f8ff254b3a92bdcfe297fffd710089dea55cbd9096615e02d38236d30183c9fabeb7c8c1ad8ccbcd7e414

data/lib/docker/template/version.rb

@@ -4,6 +4,6 @@
 
 module Docker
   module Template
-    VERSION = "0.14.0"
+    VERSION = "0.15.0"
   end
 end

data/templates/rootfs/alpine.erb

@@ -9,7 +9,9 @@ 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/<%= @meta.release =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/community"
+MIRRORS=$MIRRORS"\n@communityEdge http://$MIRROR_HOST/alpine/edge/community"
 MIRRORS=$MIRRORS"\n@testing http://$MIRROR_HOST/alpine/edge/testing"
+MIRRORS=$MIRRORS"\n@edge http://$MIRROR_HOST/alpine/edge/main"
 RELEASE_URL="http://$MIRROR_HOST/alpine/<%= @meta.release \
   =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/main"
 
@@ -38,10 +40,12 @@ cp -R $COPY_DIR/* $ROOTFS 2> /dev/null || true
 
 # --
 
-cp /etc/hosts $ROOTFS/etc/hosts
 cp /etc/resolv.conf $ROOTFS/etc/resolv.conf
 printf "$MIRRORS" > $ROOTFS/etc/apk/repositories
-apk --update --root=$ROOTFS add <%= @meta.packages %>
+cp /etc/hosts $ROOTFS/etc/hosts
+
+apk --root=$ROOTFS update
+apk --root=$ROOTFS add <%= @meta.packages %>
 apk del --root=$ROOTFS <%= @meta.package_cleanup %>
 apk del --root=$ROOTFS <%= @meta.package_deep_cleanup %>
 mv $ROOTFS/var/run/* $ROOTFS/run 2> /dev/null || true
@@ -56,7 +60,8 @@ ln -sf /run $ROOTFS/var/run
   mkdir -p /usr/src
   cd /usr/src
 
-  apk --update add ca-certificates git
+  apk update
+  apk add ca-certificates git
   git clone --verbose https://github.com/envygeeks/docker-helper.git
   cp -R docker-helper/src/* $ROOTFS/
 <% end %>

data/templates/rootfs/ubuntu.erb

@@ -11,7 +11,8 @@ TMP=$(mktemp -d)
 # --
 
 cd $TMP
-apk --update add wget gnupg ca-certificates \
+apk update
+apk add wget gnupg ca-certificates \
 	gawk sed
 
 # --
@@ -86,7 +87,7 @@ chroot "$ROOTFS" sh -ec "{
   mkdir -p /usr/src
   cd /usr/src
 
-  apk --update add ca-certificates git
+  apk add ca-certificates git
   git clone --verbose https://github.com/envygeeks/docker-helper.git
   cp -R docker-helper/src/* $ROOTFS/
 <% end %>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker-template
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.15.0
 platform: ruby
 authors:
 - Jordon Bedwell