1
0
mirror of /repos/baseimage-docker.git synced 2025-12-30 08:01:31 +01:00

153 Commits

Author SHA1 Message Date
yebyen
949bd1d89f needed for insecure key usage
`chmod 600` is for the benefit of ssh client, which will otherwise spew:

```
chmod 600 image/insecure_key.pub
SSHing into 172.17.0.2
Warning: Permanently added '172.17.0.2' (ECDSA) to the list of known hosts.
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
@         WARNING: UNPROTECTED PRIVATE KEY FILE!          @
@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
Permissions 0664 for 'image/insecure_key' are too open.
It is required that your private key files are NOT accessible by others.
This private key will be ignored.
bad permissions: ignore key: image/insecure_key
```

As you can see though, the wrong file is `chmod`'ed -- it's the private key that SSH will insist should be protected with a more restrictive mode.

After this, `CMD ["/sbin/my_init", "--enable-insecure-key"]` works as expected.
2014-06-09 12:32:52 -04:00
Hongli Lai
0325abf74e Changelog.md now explicitly mentions that the latest version is not yet released 2014-05-16 14:17:15 +02:00
Hongli Lai (Phusion)
22c3d60d94
Install ca-certificates package by default.
This is because we include `apt-transport-https`, but Ubuntu 14.04 no longer
installs `ca-certificates` by default anymore. Closes GH-73.
2014-05-12 23:07:17 +02:00
Hongli Lai (Phusion)
b56693beb3
Fix syslog-ng.
The system() source in the default syslog-ng config file does
not work in Docker because it tries to access /proc/kmsg,
which is not allowed due to Docker's privileges. We replace
it by a source that only reads from /dev/log.
2014-05-12 17:29:45 +02:00
Hongli Lai (Phusion)
612b1504af
The syslog-ng script should restore /dev/xconsole permissions because that's what the official init script does 2014-05-12 16:43:55 +02:00
Hongli Lai (Phusion)
7bde5d9993
Document release date of 0.9.10 2014-05-12 16:15:59 +02:00
Hongli Lai (Phusion)
af11b5e7b4 Early in the my_init initialization process, do not overwrite already-defined environment variables by the ones in /etc/container_environment.
Closes GH-52.
2014-05-12 16:14:47 +02:00
Hongli Lai (Phusion)
29d315891f Use Ubuntu 14.04 as Vagrant box 2014-05-12 16:14:44 +02:00
Hongli Lai (Phusion)
5e0b1b6267
Update URLs to Vagrant boxes 2014-05-12 13:56:40 +02:00
Hongli Lai (Phusion)
e0d3f5d1a4
Bump version to 0.9.10 2014-05-12 10:32:34 +02:00
Hongli Lai (Phusion)
03adf9b696
Document the new environment variable newline handling in my_init 2014-05-12 10:32:18 +02:00
Hongli Lai (Phusion)
51748c3b1d
Update the README to say that we're on Ubuntu 14.04 now. 2014-05-12 10:24:52 +02:00
Hongli Lai (Phusion)
895b145207
Update Changelog 2014-05-12 10:24:02 +02:00
mpeterson
d3d4b6124a modified setuser to use Python3 (default on 14.04) 2014-05-12 10:21:54 +02:00
mpeterson
5cfdd42d4b Modify defaults for syslog_ng to function properly
On 14.04 (trusty) there is nos no need to list all the modules since that was fixed.
No only that, listing them causes an error and it doesn't start.
2014-05-12 10:21:54 +02:00
Kingdon Barrett
6acfd8794d Remove /dev/log if it's a file a file.
Fixes https://github.com/phusion/baseimage-docker/pull/25
2014-05-12 10:21:36 +02:00
Santiago M. Mola
90ff4682df Migrate to Python 3
Ubuntu Trusty ships Python 3 by default, but not Python 2. Older versions already ship Python 3, so this change should be safe.
2014-05-10 12:28:23 +00:00
Paul Jimenez
17f000b744 Upgrade from Precise to Trusty
Conflicts:
	image/sources.list
2014-05-10 12:26:34 +00:00
mpeterson
90262a0460 Better way to enable universe and multiverse
Instead of copying over a hardcoded file we just uncomment the correct lines via two simple sed commands.

Conflicts:
	image/sources.list
2014-05-10 12:24:41 +00:00
Hongli Lai
9f369b5ed7 Merge pull request #51 from nanobeep/patch-1
Use '--rm' instead of '-rm', which was deprecated in Docker 0.9
2014-04-21 16:43:35 +02:00
Matt Jaynes
2ba32b6172 Use '--rm' instead of '-rm', which was deprecated in Docker 0.9 2014-04-08 15:36:36 -06:00
Hongli Lai
c740ff2f4d Merge pull request #49 from harto/trim-env-newlines
Trim trailing newlines from file-based envs
2014-04-02 16:47:09 +02:00
Stuart Campbell
5e2ee3838d Trim trailing newlines from file-based envs
Many editors add a trailing newline to files. This can result in
slightly unexpected values for environment variables read from
/etc/container_environment.
2014-04-03 00:13:09 +11:00
Hongli Lai (Phusion)
8f9eefa1f6
Correctly pass child process' exit status to sys.exit(). Closes GH-45 2014-03-28 10:23:25 +01:00
Hongli Lai (Phusion)
5ae32384d5
Document 0.9.9 release date 2014-03-25 17:18:16 +01:00
Hongli Lai (Phusion)
f55fde8d99
Fix a bug in the build process 2014-03-25 17:06:53 +01:00
Hongli Lai (Phusion)
0632b4865b Set the INITRD env variable and make 'ischroot' always return true.
This prevents initramfs and initscripts updates from breaking.
2014-03-25 16:44:33 +01:00
Hongli Lai (Phusion)
7914d8ac55 Enable more Ubuntu APT repositories. 2014-03-25 16:44:29 +01:00
Hongli Lai (Phusion)
73709ed0a0
During 'docker build', temporarily disable dpkg fsync to make it faster 2014-03-25 16:22:04 +01:00
Hongli Lai (Phusion)
dfaac83527
Run 'docker build' with '--rm' instead of '-rm', the latter which has been deprecated in Docker 0.9. 2014-03-25 15:49:46 +01:00
Hongli Lai (Phusion)
e11f2b8cfd
Bump version to 0.9.9 2014-03-25 15:49:16 +01:00
Hongli Lai (Phusion)
fa3098206d
Update Changelog 2014-03-25 15:48:05 +01:00
Hongli Lai (Phusion)
ad347d91c8 Merge branch 'amirgur1-master' 2014-03-25 15:37:18 +01:00
Hongli Lai (Phusion)
55727c2f30
Cleanup Amir Gur's patch 2014-03-25 15:36:15 +01:00
Hongli Lai (Phusion)
c8e79991b7 Merge branch 'master' of https://github.com/amirgur1/baseimage-docker into amirgur1-master 2014-03-25 15:30:00 +01:00
Hongli Lai
a03b58d94d Merge pull request #42 from rhacker/patch-1
Fix typo in Makefile
2014-03-19 10:49:41 +01:00
Dung Quang
ed89f20836 Update Makefile 2014-03-19 09:14:34 +07:00
Hongli Lai (Phusion)
fd8a1273ad
Update Changelog 2014-03-17 12:59:03 +01:00
Hongli Lai
4094d20cec Merge pull request #38 from slawo-ch/patch-1
properly specify location of sftp-server binary
2014-03-17 12:57:51 +01:00
Slawomir Chodnicki
585932c74c properly specify location of sftp-server binary
Currently there is a symlink at /usr/lib/sftp-server to /usr/lib/openssh/sftp-server in the image. That seems to give trouble with packages like the rssh restricted shell, which will not follow a symlink to the sftp server binary for security reasons. So currently it is not possible to use this image as a basis for scp/sftp only access over ssh.
2014-03-15 18:08:28 +01:00
Hongli Lai
3366687e86 Merge pull request #35 from Laurent-Sarrazin/patch-1
Fix a typo
2014-03-14 11:54:15 +01:00
Laurent Sarrazin
b749352f1e Fix a typo 2014-03-12 23:27:50 +01:00
Hongli Lai
25d9972c0b Merge pull request #34 from felixhummel/typo
rw is enough for the insecure_key
2014-03-11 15:12:13 +01:00
Felix Hummel
5b1b6e8364 rw is enough for the insecure_key 2014-03-11 13:15:59 +01:00
Hongli Lai
0dab5aa4c8 Merge pull request #30 from ruphin/master
typo fix
2014-03-06 12:52:15 +01:00
Amir Gur
2ef5fa1659 * More Parametrization, example.
* All synced_folders are included.
 * Vagrantfile of baseimage and passenger are nearly identical now.  (I got to that when wanting to try passenger.  But already had a vagrant box started from baseimage, there was no need to dup the effort, just reuse the existing single box for all.  Then in end of day, may not need multiple Vagrantfiles.  Passenger is a simple structure/process for managing dockers, but only needing to use baseimage once and have one VM up)
2014-03-06 02:28:27 -08:00
Goffert van Gool
17cb4cebca typo fix 2014-03-06 02:54:37 +01:00
Amir Gur
ac7f9b0785 - Parametrized passenger-docker location 2014-03-04 14:33:57 -08:00
Amir Gur
d06b177508 - Parametrize
- Print docker version
- Add a d alias to docker
- Cleanup
2014-03-03 18:39:28 -08:00
Hongli Lai (Phusion)
775ded05dc
Fix permissions on test scripts 2014-02-26 11:56:19 +01:00