docker-template 0.14.0 → 0.15.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/docker/template/version.rb +1 -1
- data/templates/rootfs/alpine.erb +8 -3
- data/templates/rootfs/ubuntu.erb +3 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5060791217036cf86cc67c35c8ab1e704b3f267c
|
|
4
|
+
data.tar.gz: b938025a0acb248c6d4d61af6fac0fbadf93d09d
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 608e74b78188be05ad57b1c700320e8457e07544baa95a357c7c6cc48cb829e0d62ca328f3b964e671307f982d9cb2c73dca40ef1ad005761fc50b3f0d007785
|
|
7
|
+
data.tar.gz: 871506fd6725da0fc6d82506201540dda1fdfe6dcd9f8ff254b3a92bdcfe297fffd710089dea55cbd9096615e02d38236d30183c9fabeb7c8c1ad8ccbcd7e414
|
data/templates/rootfs/alpine.erb
CHANGED
|
@@ -9,7 +9,9 @@ MIRROR_HOST="<%= @meta.mirror_host %>"
|
|
|
9
9
|
[ "$MIRROR_HOST" ] || MIRROR_HOST="mirror.envygeeks.io"
|
|
10
10
|
MIRRORS="\nhttp://$MIRROR_HOST/alpine/<%= @meta.release =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/main"
|
|
11
11
|
MIRRORS=$MIRRORS"\n@community http://$MIRROR_HOST/alpine/<%= @meta.release =~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/community"
|
|
12
|
+
MIRRORS=$MIRRORS"\n@communityEdge http://$MIRROR_HOST/alpine/edge/community"
|
|
12
13
|
MIRRORS=$MIRRORS"\n@testing http://$MIRROR_HOST/alpine/edge/testing"
|
|
14
|
+
MIRRORS=$MIRRORS"\n@edge http://$MIRROR_HOST/alpine/edge/main"
|
|
13
15
|
RELEASE_URL="http://$MIRROR_HOST/alpine/<%= @meta.release \
|
|
14
16
|
=~ /^[\d,\.]+$/ ? "v" : "" %><%= @meta.release %>/main"
|
|
15
17
|
|
|
@@ -38,10 +40,12 @@ cp -R $COPY_DIR/* $ROOTFS 2> /dev/null || true
|
|
|
38
40
|
|
|
39
41
|
# --
|
|
40
42
|
|
|
41
|
-
cp /etc/hosts $ROOTFS/etc/hosts
|
|
42
43
|
cp /etc/resolv.conf $ROOTFS/etc/resolv.conf
|
|
43
44
|
printf "$MIRRORS" > $ROOTFS/etc/apk/repositories
|
|
44
|
-
|
|
45
|
+
cp /etc/hosts $ROOTFS/etc/hosts
|
|
46
|
+
|
|
47
|
+
apk --root=$ROOTFS update
|
|
48
|
+
apk --root=$ROOTFS add <%= @meta.packages %>
|
|
45
49
|
apk del --root=$ROOTFS <%= @meta.package_cleanup %>
|
|
46
50
|
apk del --root=$ROOTFS <%= @meta.package_deep_cleanup %>
|
|
47
51
|
mv $ROOTFS/var/run/* $ROOTFS/run 2> /dev/null || true
|
|
@@ -56,7 +60,8 @@ ln -sf /run $ROOTFS/var/run
|
|
|
56
60
|
mkdir -p /usr/src
|
|
57
61
|
cd /usr/src
|
|
58
62
|
|
|
59
|
-
apk
|
|
63
|
+
apk update
|
|
64
|
+
apk add ca-certificates git
|
|
60
65
|
git clone --verbose https://github.com/envygeeks/docker-helper.git
|
|
61
66
|
cp -R docker-helper/src/* $ROOTFS/
|
|
62
67
|
<% end %>
|
data/templates/rootfs/ubuntu.erb
CHANGED
|
@@ -11,7 +11,8 @@ TMP=$(mktemp -d)
|
|
|
11
11
|
# --
|
|
12
12
|
|
|
13
13
|
cd $TMP
|
|
14
|
-
apk
|
|
14
|
+
apk update
|
|
15
|
+
apk add wget gnupg ca-certificates \
|
|
15
16
|
gawk sed
|
|
16
17
|
|
|
17
18
|
# --
|
|
@@ -86,7 +87,7 @@ chroot "$ROOTFS" sh -ec "{
|
|
|
86
87
|
mkdir -p /usr/src
|
|
87
88
|
cd /usr/src
|
|
88
89
|
|
|
89
|
-
apk
|
|
90
|
+
apk add ca-certificates git
|
|
90
91
|
git clone --verbose https://github.com/envygeeks/docker-helper.git
|
|
91
92
|
cp -R docker-helper/src/* $ROOTFS/
|
|
92
93
|
<% end %>
|