Commit ae8e13faf435bd88fa71c056586c19ad89097752 - debuerreotype

+15

-11

.travis.yml less more

1	1	services: docker
2	2
3	3	env:
4		- SUITE=stable CODENAME=jessie TIMESTAMP=2017-01-01T00:00:00Z SHA256=6b84f7ecfc0e6c399d0673e80c81b7f3d28e8655bede70d13651221e3453a18a
5		- SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=6b84f7ecfc0e6c399d0673e80c81b7f3d28e8655bede70d13651221e3453a18a
6		- SUITE=testing CODENAME=stretch TIMESTAMP=2017-01-01T00:00:00Z SHA256=31f686a39f685a0368839b0681d286d596aa5133cfc5d214210b271300e01b8e
7		- SUITE=stretch CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=31f686a39f685a0368839b0681d286d596aa5133cfc5d214210b271300e01b8e
8		- SUITE=unstable CODENAME=sid TIMESTAMP=2017-01-01T00:00:00Z SHA256=a10b1a69246d42352f7b30d1de2539b7e478625803b9a7f5302b89401f052379
9		- SUITE=sid CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=a10b1a69246d42352f7b30d1de2539b7e478625803b9a7f5302b89401f052379
10		- SUITE=oldstable CODENAME=wheezy TIMESTAMP=2017-01-01T00:00:00Z SHA256=15e13bcde2b5cc73664540d5484bbc8a363b824182c0bcf33340b9a72bc546d7
11		- SUITE=wheezy CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=15e13bcde2b5cc73664540d5484bbc8a363b824182c0bcf33340b9a72bc546d7
	4	- SUITE=stable CODENAME=jessie TIMESTAMP=2017-01-01T00:00:00Z SHA256=c3f1697c699487382d5d15e4462c0e84b3069d3fc29ca100914c20258aa8ecc3
	5	- SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=c3f1697c699487382d5d15e4462c0e84b3069d3fc29ca100914c20258aa8ecc3
	6	- SUITE=testing CODENAME=stretch TIMESTAMP=2017-01-01T00:00:00Z SHA256=c4e7b05a8a3e0d6af65b976bd249cc4a31ba301ebbea524b5412b5e07ae3b460
	7	- SUITE=stretch CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=c4e7b05a8a3e0d6af65b976bd249cc4a31ba301ebbea524b5412b5e07ae3b460
	8	- SUITE=unstable CODENAME=sid TIMESTAMP=2017-01-01T00:00:00Z SHA256=427a4be9f69b4bb24069f97b60e9a66d5d6f7c978b924afe3cdb868709756e93
	9	- SUITE=sid CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=427a4be9f69b4bb24069f97b60e9a66d5d6f7c978b924afe3cdb868709756e93
	10	- SUITE=oldstable CODENAME=wheezy TIMESTAMP=2017-01-01T00:00:00Z SHA256=59387392aa63da1f77ea28be581a4b2d8e7e9720121d1d563a3f0cb4356f9856
	11	- SUITE=wheezy CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=59387392aa63da1f77ea28be581a4b2d8e7e9720121d1d563a3f0cb4356f9856
12	12	# EOL suites testing
13		- SUITE=eol CODENAME=etch TIMESTAMP=2017-01-01T00:00:00Z SHA256=416a70ca3a8375d139c840996d5bbcae7f1e3e8a5cffab98dd6ecb5d9347aa00
14		- SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2017-01-01T00:00:00Z SHA256=36eecde5411e245927745043e3c20651d3ed41c7aad47404d39d1ee97ae80f09
	13	- SUITE=eol CODENAME=etch TIMESTAMP=2017-01-01T00:00:00Z SHA256=928f3c7fcc580360e7f9af7f1d43d65e856ffb6417eae77df78fcd9fe1a72e9a
	14	- SUITE=eol CODENAME=woody ARCH=i386 TIMESTAMP=2017-01-01T00:00:00Z SHA256=fd6d9fe8da1a695c5a0b9880b72a9d14929bdd57ed54daff86c01addb31b984d
15	15	# qemu-debootstrap testing
16		- ARCH=arm64 SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=27daa0fd15340367965e689e75bff4839e63a44cc2db48196b99bc9257bf3277
	16	- ARCH=arm64 SUITE=jessie CODENAME= TIMESTAMP=2017-01-01T00:00:00Z SHA256=a54b0b74f32d2c03f4036e7c305672471553ac18682ba109d9481da31069dc94
	17	# a few entries for "today" to try and catch issues like https://github.com/debuerreotype/debuerreotype/issues/41 sooner
	18	- SUITE=unstable CODENAME= TIMESTAMP="today 00:00:00" SHA256=
	19	- SUITE=stable CODENAME= TIMESTAMP="today 00:00:00" SHA256=
	20	- SUITE=oldstable CODENAME= TIMESTAMP="today 00:00:00" SHA256=
17	21
18	22	addons:
19	23	apt:

+2

-2

Dockerfile less more

36	36	# debuerreotype-init test-stretch stretch 2017-05-08T00:00:00Z
37	37	# debuerreotype-tar test-stretch test-stretch.tar
38	38	# md5sum test-stretch.tar
39		# 983b79e9c4ba158e269ef9964dbab60b
	39	# 14206d5b9b2991e98f5214c3d310e4fa
40	40
41	41	# debuerreotype-init test-jessie jessie 2017-05-08T00:00:00Z
42	42	# debuerreotype-tar test-jessie test-jessie.tar
43	43	# md5sum test-jessie.tar
44		# 93ad9886b0e0da17aae584d3a0236d0c
	44	# 57f98d3636000630080e5ba208508e10

+1

-1

README.md less more

88	88	$ debuerreotype-gen-sources-list rootfs stretch http://deb.debian.org/debian http://security.debian.org/debian-security
89	89
90	90	$ debuerreotype-tar rootfs - \| sha256sum
91		799e1d60e516d6ba41a17a6cfe7c26c0e5749721efe18f30618e799f41c9cd65 -
	91	745b94242ba9427bd0991b2fadb23e328170e7e59d441c08dde971eef257767a -
92	92
93	93	$ # try it! you should get that same sha256sum value!
94	94	```

+1

-1

VERSION less more

0		0.7
	0	0.8

+1

-0

scripts/debuerreotype-chroot less more

30	30	mount --rbind "/$dir" "$targetDir/$dir"
31	31	fi
32	32	done
	33	mount --rbind --read-only /etc/resolv.conf "$targetDir/etc/resolv.conf"
33	34	exec chroot "$targetDir" /usr/bin/env -i PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" TZ="$TZ" LC_ALL="$LC_ALL" SOURCE_DATE_EPOCH="$epoch" "$@"
34	35	' -- "$cmd" "$@"

+4

-3

scripts/debuerreotype-gen-sources-list less more

53	53	;;
54	54
55	55	*)
	56	# https://salsa.debian.org/installer-team/apt-setup/tree/d7a642fb5fc76e4f0b684db53984bdb9123f8360/generators
	57	deb "$mirror" "$suite" "$comp" # "50mirror"
	58	deb "$secmirror" "$suite/updates" "$comp" # "91security"
	59	deb "$mirror" "$suite-updates" "$comp" # "92updates"
56	60	# https://wiki.debian.org/SourcesList#Example_sources.list
57		deb "$mirror" "$suite" "$comp"
58		deb "$mirror" "$suite-updates" "$comp"
59		deb "$secmirror" "$suite/updates" "$comp"
60	61	;;
61	62	esac
62	63	} > "$targetDir/etc/apt/sources.list"

+3

-2

scripts/debuerreotype-init less more

156	156	\| cut -f1 -d' ' \
157	157	> "$targetDir/etc/machine-id" # TODO should we only do this if "/etc/machine-id" already exists?
158	158	{
159		echo 'nameserver 8.8.8.8'
160		echo 'nameserver 8.8.4.4'
	159	echo '# https://1.1.1.1 (privacy-focused, highly-available DNS service)'
	160	echo 'nameserver 1.1.1.1'
	161	echo 'nameserver 1.0.0.1'
161	162	} > "$targetDir/etc/resolv.conf"
162	163	chmod 0644 \
163	164	"$targetDir/etc/hostname" \

+8

-1

scripts/debuerreotype-minimizing-config less more

117	117
118	118	Acquire::GzipIndexes "true";
119	119	EOF
120		if [[ "$aptVersion" == 0.* ]] \|\| "$thisDir/debuerreotype-chroot" "$targetDir" dpkg --compare-versions "$aptVersion" '<<' '1.0.9.2~'; then
	120	# https://github.com/debuerreotype/debuerreotype/issues/41
	121	isDebianJessie="$([ -f "$targetDir/etc/os-release" ] && source "$targetDir/etc/os-release" && [ "${ID:-}" = 'debian' ] && [ "${VERSION_ID:-}" = '8' ] && echo '1')" \|\| :
	122	if [ -n "$isDebianJessie" ] \|\| [[ "$aptVersion" == 0.* ]] \|\| "$thisDir/debuerreotype-chroot" "$targetDir" dpkg --compare-versions "$aptVersion" '<<' '1.0.9.2~'; then
121	123	cat >> "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF'
122	124
123	125	# https://salsa.debian.org/apt-team/apt/commit/b0f4b486e6850c5f98520ccf19da71d0ed748ae4; released in src:apt 1.0.9.2, 2014-10-02
124	126	# prior to src:apt 1.0.9.2, "Acquire::GzipIndexes" _only_ applied to gzip-compressed list files, so we need to prefer those on older releases
125	127	Acquire::CompressionTypes::Order:: "gz";
126	128	EOF
	129	if [ -n "$isDebianJessie" ]; then
	130	cat >> "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF'
	131	# see also https://github.com/debuerreotype/debuerreotype/issues/41 (details of a bug that's apparently specific to Debian Jessie)
	132	EOF
	133	fi
127	134	fi
128	135	chmod 0644 "$targetDir/etc/apt/apt.conf.d/docker-gzip-indexes"
129	136