Commit Graph

27 Commits

Author SHA1 Message Date
c540865248 Add support for Arch Linux ARM. (Close #16695)
Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Switch to "case"

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Support multiple ARM architectures

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

Add check for ArchLinuxARM Keyring

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>

mkimage-arch.sh: Fix for merging

Signed-off-by: Giampaolo Mancini <giampaolo@trampolineup.com>
Upstream-commit: 824ae856325b53d4c84bd000713f63720d79b67a
Component: engine
2015-12-13 19:48:40 +01:00
68fe06d253 mkimage-arch: remove the test container after run
Signed-off-by: Rui Lopes <rgl@ruilopes.com>
Upstream-commit: ca94adc7c1ff7719be704282fe6daf1fb57161e0
Component: engine
2015-11-22 11:49:54 +00:00
d3ad3f2693 mkimage-arch: set C.UTF-8 default locale
It may not work fine when doing expect script if setting other locales.

Signed-off-by: Jun-Ru Chang <jrjang@gmail.com>
Upstream-commit: 9e9adf807505e4355a98206f0937e504fcf77a84
Component: engine
2015-04-01 00:40:34 +08:00
4c5199075f mkimage-arch.sh - don't run docker in interactive mode
Don't run docker in interactive mode in the archlinux container build script. Recent versions of Docker error out with "cannot enable tty mode on non tty input" when being run non-interactively (such as in a cron job, Jenkins build, etc.)

Signed-off-by: Jared Biel <jared.biel@bolderthinking.com>
Upstream-commit: 4ff56bbddf23c64586920a8861f75c3d35413e49
Component: engine
2015-01-29 19:49:28 +00:00
d5a1764c0a Delete man pages of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 18c0b415644b594969bbec49de51098be62d18f8
Component: engine
2015-01-13 18:10:50 +01:00
88f9df3419 Revise list of installed packages in mkimage-arch.sh
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: 9f59b057be25656214d65040ae113c0d76d99324
Component: engine
2015-01-13 18:10:50 +01:00
f42b6ea0bd Fix #9462
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: d04debddd983b3aa48ad38659d2c3debe794d374
Component: engine
2014-12-12 03:25:14 +01:00
7abfca08df Preserve extended attributes and acls on archlinux build
Failure to do this means that file capabilites are not preserved in the image.
Ping fails to work as a non-root user if cap_net_raw is capability is not set

Signed-off-by: Dan Griffin <dgriffin@peer1.com>
Upstream-commit: e857716d2d881aaf1cf5a775d02ee5b109d9e423
Component: engine
2014-10-06 09:58:33 +01:00
a276156a44 Fix expect script in mkimage-arch
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: e72f8161b91e3cdb8a9bc4369ff5f9673a549e2c
Component: engine
2014-07-10 02:09:50 +02:00
b3bd2d5b6c Revert "removed expect from mkimage-arch since it was not working"
This reverts commit 962e1186f9a0a43344e19dcf70bac159f0eafb4e.

Conflicts:
	contrib/mkimage-arch.sh

Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com> (github: ztombol)
Upstream-commit: de5f3020d92f14e7ff544d92440c5bf9e012d460
Component: engine
2014-07-10 01:58:15 +02:00
f6a9c4ccbd Merge branch 'master' of https://github.com/NikolaMandic/docker into NikolaMandic-master
* 'master' of https://github.com/NikolaMandic/docker:
  removed expect from mkimage-arch since it was not working

Conflicts:
	contrib/mkimage-arch.sh

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 75b3b382ca182bf9386bc03726b4edfa41f044e8
Component: engine
2014-06-30 15:52:04 -06: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
ac125f4405 removed expect from mkimage-arch since it was not working
Docker-DCO-1.1-Signed-off-by: NikolaMandic <mn080202@gmail.com> (github: NikolaMandic)
Upstream-commit: 962e1186f9a0a43344e19dcf70bac159f0eafb4e
Component: engine
2014-06-18 19:25:51 +02:00
4dd6b5c6c0 Fix broken /dev/fd in mkimage-arch.sh
Exactly the same problem as dotcloud/docker#2356

Docker-DCO-1.1-Signed-off-by: Lance Chen <cyen0312@gmail.com> (github: Lance0312)
Upstream-commit: e6b794e5424dd108003063f70e2fb2973dba643e
Component: engine
2014-04-19 16:04:35 +08:00
0802cd5e0f don't skip cert check for an example & use HTTPS
This changes two URLs from http to https and it fixes a Dockerfile to
stop skipping certificate validation. It also adds the ca-certificates
package to that Dockerfile example.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 73a277eb2fd66b815b11e9d2caff2c31c18a0854
Component: engine
2014-02-20 01:11:04 +02:00
19172f19fc Update mkimage-arch.sh
mktemp creates a root directory ("/") with permissions set to 700. Default should be 755 so other users in the container can access its subdirs (e.g http user for nginx for /srv/http/test/index.html).

Docker-DCO-1.1-Signed-off-by: Samuel Andaya <samuel@andaya.net> (github: sandaya)
Upstream-commit: 736bf3f7e6ae4a80cc85c846a4d5d074a325c9f4
Component: engine
2014-02-03 21:26:47 -05:00
df0756600a Merge pull request #3707 from bkcsoft/fix-bash-hashbangs
Update bash shebangs to use "/usr/bin/env bash" for increased portability
Upstream-commit: 572002a71593009bd4dd3285ac429b70042b6ce6
Component: engine
2014-01-21 17:30:52 -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
7f4f60d7bd mkimage-arch: provide and use own pacman.conf
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: 4137a0ea327ea1775c1b57892fd684da2c738f3e
Component: engine
2014-01-21 14:22:56 +01:00
94cf963f92 mkimage-arch: use hash to check if command is available
Apart from having more predictable return codes on various operating
systems, it additionally caches the path to application.

Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: 787ff55283067ef3d8da3238e65ca204bc63b3f9
Component: engine
2014-01-21 14:22:47 +01:00
7ed82adb9b mkimage-arch: don't generate ISO-8859-1 locale
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: da4ba80733ff4826ea17d253677a58fdedf4cc00
Component: engine
2014-01-21 14:22:39 +01:00
2034daa056 mkimage-arch: unify usage of brackets around variables
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: c6535d272c0d1a07ea51639be66e1959a0fc996f
Component: engine
2014-01-21 14:22:33 +01:00
5807b83360 mkimage-arch: remove $DEV instead of renaming it
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: a4e6e9bd41ee0f80e7e9bce05156ddd7d63554aa
Component: engine
2014-01-21 14:22:26 +01:00
80f16b65b6 mkimage-arch: use mktemp to create ROOTFS directory
Docker-DCO-1.1-Signed-off-by: Bartłomiej Piotrowski <b@bpiotrowski.pl> (github: Barthalion)
Upstream-commit: c138c335a5d867d81231fdca6f418a9cc11ca244
Component: engine
2014-01-21 14:21:43 +01: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
b7d138e4ad Use heredoc to make expect script more clear
Upstream-commit: f34a62ea19b477bbaa74a09c04d5e8faf67c44a2
Component: engine
2013-10-18 00:35:12 -05:00
c5210160da Add mkimage-arch.sh
Upstream-commit: d94a027da6fc75e856b31246de0b4a49206e942b
Component: engine
2013-10-16 02:26:15 +00:00