Commit Graph

20 Commits

Author SHA1 Message Date
d4497c7a2b .: remove trailing white spaces
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 7617ec176d266650b19c2378ccab4aa41e6dc5a2
Component: engine
2015-03-25 13:38:17 -04:00
abd71318ca Revert "Dealing with trailing whitespaces"
The validation script from #10681 is too pedantic, and does not handle
well situations like:

```
cat <<EOF   # or <<-EOF
	Whether the leading whitespace is stripped out or not by bash
	it should still be considered as valid.
EOF
```

This reverts commit 4e65c1c319afffc325853b88c9aef0c42ec83482.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0252ad0adc37a34b88fa908ae74a13b940febdcb
Component: engine
2015-03-25 10:04:56 -06:00
a64392e089 Dealing with trailing whitespaces
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*

Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md

Signed-off-by: André Martins <martins@noironetworks.com>
Upstream-commit: 4e65c1c319afffc325853b88c9aef0c42ec83482
Component: engine
2015-03-17 03:34:01 +00:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
0e8f1c0764 mkimage: use /var/tmp by default instead of /tmp
Additionally, this can be overridden by setting the TMPDIR variable,
like this was already the case for the generic `mkimage.sh` script.

As explained in #6456, the rationale to use `/var/tmp` instead of `/tmp`
is that `/tmp` is often a small tmpfs filesystem with more restricted
rights.

Docker-DCO-1.1-Signed-off-by: Vincent Bernat <vincent@bernat.im> (github: vincentbernat)
Upstream-commit: 287e604a8f53e569d355b1b6c75f6736f4927281
Component: engine
2014-06-27 14:43:12 +02:00
bcf6aedaa9 Add deprecation warnings to the mkimage scripts that are have consolidated mkimage implementations
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 51f707cf9dfb2dbe31cfd0cd92b922ca5d98e842
Component: engine
2014-05-21 09:58:11 -06:00
d7be599a05 mkimage-debootstrap: set ubuntuLatestLTS as Trusty
Ubuntu 14.04 LTS (Trusty Tahr) was released on Thu, 17 Apr 2014; Update
ubuntuLatestLTS accordingly.

Docker-DCO-1.1-Signed-off-by: Jonathan McCrohan <jmccrohan@gmail.com> (github: jmccrohan)
Upstream-commit: 9e64a4d862e38ead4c2708ce61663f176844406b
Component: engine
2014-05-07 08:26:24 +01:00
063107f17f upgrade packages after debootstrap
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d04f4d836c6b2a9266350a1b0e284949dcc6510a
Component: engine
2014-03-08 18:41:50 +02:00
48edd91d26 Add "SteamOS" support to mkimage-debootstrap (requires a debootstrap script like https://github.com/tianon/gentoo-overlay/blob/master/dev-util/debootstrap-valve/files/scripts/alchemist)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cd94c9d66693253ce71d8c691cb937980dd96565
Component: engine
2014-02-24 12:55:04 -07:00
6253b6b7aa contrib/debootstrap: Add initial support for Tanglu
This will add support for Tanglu, a Debian based Linux-distribution.

Docker-DCO-1.1-Signed-off-by: Matthias Klumpp <matthias@tenstral.net> (github: Ximion)
Upstream-commit: 4bfc8e97222b8908176d2420060bbeae613a571c
Component: engine
2014-02-22 17:25:52 +01:00
86c10c5a7d Merge pull request #3588 from tianon/debootstrap-tweaks
Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Upstream-commit: e1b210bee95b894c21f74f1df0efdfe0d6e93c56
Component: engine
2014-01-29 08:42:14 -08:00
923913cbf1 This should make all bash-scripts run on pretty much any posix-system (with bash installed ofc...)
Docker-DCO-1.1-Signed-off-by: Kim BKC Carlbacker <kim.carlbacker@gmail.com> (github: bkcsoft)
Upstream-commit: b1953baba28362c928d962f0729325d3293c4753
Component: engine
2014-01-22 02:21:56 +01:00
aa9b4113c7 Add a few small tweaks to mkimage-debootstrap, especially to help with lucid
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 5a3fa3c901bfc226456f3caa13d26b77e5ca2f4d
Component: engine
2014-01-14 04:20:27 -07:00
d4d3461e31 Fix glob expansion for no-cache setting.
On previous version, glob pattern will be expanded to actual file
names when writing setting to etc/apt/apt.conf.d/no-cache.

This patch fixes to quote to work cache clean command properly.
Upstream-commit: e3b878ce983e5e01960ba5ec5c330749df7dcac4
Component: engine
2013-12-23 17:27:22 +09:00
5a444e902c Update mkimage-debootstrap with even more tweaks for keeping images tiny by more aggressively removing cache files and by not downloading apt-cache Translations files
Upstream-commit: 78b85220be021bff022e40037693f42575e8ba8d
Component: engine
2013-12-10 10:59:32 -07:00
58c14de9fd Fix images not being properly tagged
Upstream-commit: 0e64b987e8cbbd6944bd0594f8173f959867f4fc
Component: engine
2013-11-16 11:05:38 -05:00
24baeed431 Update all the mkimage scripts to use --numeric-owner as a tar argument to properly preserve ownership
Upstream-commit: 8e43db95f2299f9b63ab3d1728e73f2a5f6600b3
Component: engine
2013-10-23 14:08:16 -06:00
47b8397b61 mkimage-debootstrap.sh: Add -p option to invoke debootstrap with http_proxy.
This patch allows debootstrap to be run with the http_proxy environment
variable. This is principally useful when you're using apt-cacher and
apt-cacher-ng locally.
Upstream-commit: bc8a1081b047f6ee4ebf0adb22695fe3c98425c6
Component: engine
2013-10-24 03:21:10 +11:00
ef800becac Refactor mkimage-debootstrap.sh to be much more full-featured
This includes the following:
- options to control certain parameters
- an option specifically for creating tarballs directly, esp. for dockerbrew
- the addition of the updates and security repositories for Debian images
- the addition of the universe, updates, and security repositories for Ubuntu images
- more correct tagging of Debian images
- tagging of Ubuntu image versions (12.04, 12.10, etc) and latest tag for LTS
Upstream-commit: 095aab9d975a149c33729a0b4981d5b2649167d2
Component: engine
2013-10-15 03:44:03 -06:00
6d8f5d1b1a Rename mkimage-debian.sh to mkimage-debootstrap.sh to more clearly reflect its true function
Upstream-commit: 4967f9f19ca9ead375f7d0b3252f543082806c36
Component: engine
2013-10-15 02:26:10 -06:00