From a0c79167bb4edc88406adb79c645670d75f8cc37 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Tue, 2 Aug 2016 13:58:09 +0200 Subject: [PATCH 01/83] support for pre and post shutdown scripts --- image/bin/my_init | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/image/bin/my_init b/image/bin/my_init index 0b2b6333b..a3c2aee81 100755 --- a/image/bin/my_init +++ b/image/bin/my_init @@ -230,6 +230,26 @@ def run_startup_files(): info("Running /etc/rc.local...") run_command_killable_and_import_envvars("/etc/rc.local") +def run_pre_shutdown_scripts(): + debug("Running pre-shutdown scripts...") + + # Run /etc/my_init.pre_shutdown.d/* + for name in listdir("/etc/my_init.pre_shutdown.d"): + filename = "/etc/my_init.pre_shutdown.d/" + name + if is_exe(filename): + info("Running %s..." % filename) + run_command_killable(filename) + +def run_post_shutdown_scripts(): + debug("Running post-shutdown scripts...") + + # Run /etc/my_init.post_shutdown.d/* + for name in listdir("/etc/my_init.post_shutdown.d"): + filename = "/etc/my_init.post_shutdown.d/" + name + if is_exe(filename): + info("Running %s..." % filename) + run_command_killable(filename) + def start_runit(): info("Booting runit daemon...") pid = os.spawnl(os.P_NOWAIT, "/usr/bin/runsvdir", "/usr/bin/runsvdir", @@ -276,7 +296,7 @@ def main(args): if not args.skip_startup_files: run_startup_files() - + runit_exited = False exit_code = None @@ -314,10 +334,12 @@ def main(args): sys.exit(exit_status) finally: if not args.skip_runit: + run_pre_shutdown_scripts() shutdown_runit_services() if not runit_exited: stop_child_process("runit daemon", runit_pid) wait_for_runit_services() + run_post_shutdown_scripts() # Parse options. parser = argparse.ArgumentParser(description = 'Initialize the system.') From d29824d3fb09ddafede5e339bb566aa5a1b3ad4a Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Tue, 2 Aug 2016 14:14:10 +0200 Subject: [PATCH 02/83] creating folders in system_services.sh --- image/system_services.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/image/system_services.sh b/image/system_services.sh index da8d275f7..a3666a21d 100755 --- a/image/system_services.sh +++ b/image/system_services.sh @@ -6,6 +6,8 @@ set -x ## Install init process. cp /bd_build/bin/my_init /sbin/ mkdir -p /etc/my_init.d +mkdir -p /etc/my_init.pre_shutdown.d +mkdir -p /etc/my_init.post_shutdown.d mkdir -p /etc/container_environment touch /etc/container_environment.sh touch /etc/container_environment.json From 5b5a0c7734731dc62e28200b88c3b600b2c373d3 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:20:41 +0100 Subject: [PATCH 03/83] disabled fix pam bug --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index d543b364d..7b85ed27d 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -6,7 +6,7 @@ ADD . /bd_build RUN /bd_build/prepare.sh && \ /bd_build/system_services.sh && \ /bd_build/utilities.sh && \ - /bd_build/fix_pam_bug.sh && \ + # /bd_build/fix_pam_bug.sh && \ /bd_build/cleanup.sh CMD ["/sbin/my_init"] From 1d6be5c9401647a24f4b841bb1a8686f32f47a52 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:23:51 +0100 Subject: [PATCH 04/83] disabling ssh --- image/buildconfig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/image/buildconfig b/image/buildconfig index 564c51006..a26f01784 100644 --- a/image/buildconfig +++ b/image/buildconfig @@ -5,5 +5,8 @@ minimal_apt_get_install='apt-get install -y --no-install-recommends' # Default services # Set 1 to the service you want to disable export DISABLE_SYSLOG=${DISABLE_SYSLOG:-0} -export DISABLE_SSH=${DISABLE_SSH:-0} +# export DISABLE_SSH=${DISABLE_SSH:-0} export DISABLE_CRON=${DISABLE_CRON:-0} + +# disabling SSH +export DISABLE_SSH=1 From 4ee6a5b517e4ca10c6baaae219405980eec76148 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:28:23 +0100 Subject: [PATCH 05/83] apt-utils fix --- image/prepare.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/image/prepare.sh b/image/prepare.sh index 80d73c27d..283fc1285 100755 --- a/image/prepare.sh +++ b/image/prepare.sh @@ -27,6 +27,9 @@ ln -sf /bin/true /sbin/initctl dpkg-divert --local --rename --add /usr/bin/ischroot ln -sf /bin/true /usr/bin/ischroot +# apt-utils fix for Ubuntu 16.04 +$minimal_apt_get_install apt-utils + ## Install HTTPS support for APT. $minimal_apt_get_install apt-transport-https ca-certificates From 87485594e9d31c65df08e6aa73697ca815e3a2f2 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:30:47 +0100 Subject: [PATCH 06/83] removed ssh --- image/buildconfig | 3 - image/services/sshd/00_regen_ssh_host_keys.sh | 8 -- image/services/sshd/enable_insecure_key | 30 ---- image/services/sshd/keys/insecure_key | 27 ---- image/services/sshd/keys/insecure_key.ppk | 26 ---- image/services/sshd/keys/insecure_key.pub | 1 - image/services/sshd/sshd.runit | 3 - image/services/sshd/sshd.sh | 25 ---- image/services/sshd/sshd_config | 132 ------------------ image/system_services.sh | 3 - 10 files changed, 258 deletions(-) delete mode 100755 image/services/sshd/00_regen_ssh_host_keys.sh delete mode 100755 image/services/sshd/enable_insecure_key delete mode 100644 image/services/sshd/keys/insecure_key delete mode 100644 image/services/sshd/keys/insecure_key.ppk delete mode 100644 image/services/sshd/keys/insecure_key.pub delete mode 100755 image/services/sshd/sshd.runit delete mode 100755 image/services/sshd/sshd.sh delete mode 100644 image/services/sshd/sshd_config diff --git a/image/buildconfig b/image/buildconfig index a26f01784..26b5c3ce7 100644 --- a/image/buildconfig +++ b/image/buildconfig @@ -5,8 +5,5 @@ minimal_apt_get_install='apt-get install -y --no-install-recommends' # Default services # Set 1 to the service you want to disable export DISABLE_SYSLOG=${DISABLE_SYSLOG:-0} -# export DISABLE_SSH=${DISABLE_SSH:-0} export DISABLE_CRON=${DISABLE_CRON:-0} -# disabling SSH -export DISABLE_SSH=1 diff --git a/image/services/sshd/00_regen_ssh_host_keys.sh b/image/services/sshd/00_regen_ssh_host_keys.sh deleted file mode 100755 index d4531cb4d..000000000 --- a/image/services/sshd/00_regen_ssh_host_keys.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -set -e -if [[ ! -e /etc/service/sshd/down && ! -e /etc/ssh/ssh_host_rsa_key ]] || [[ "$1" == "-f" ]]; then - echo "No SSH host key available. Generating one..." - export LC_ALL=C - export DEBIAN_FRONTEND=noninteractive - dpkg-reconfigure openssh-server -fi diff --git a/image/services/sshd/enable_insecure_key b/image/services/sshd/enable_insecure_key deleted file mode 100755 index f8c994201..000000000 --- a/image/services/sshd/enable_insecure_key +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -set -e - -AUTHORIZED_KEYS=/root/.ssh/authorized_keys - -if [[ -e "$AUTHORIZED_KEYS" ]] && grep -q baseimage-docker-insecure-key "$AUTHORIZED_KEYS"; then - echo "Insecure key has already been added to $AUTHORIZED_KEYS." -else - DIR=`dirname "$AUTHORIZED_KEYS"` - echo "Creating directory $DIR..." - mkdir -p "$DIR" - chmod 700 "$DIR" - chown root:root "$DIR" - echo "Editing $AUTHORIZED_KEYS..." - cat /etc/insecure_key.pub >> "$AUTHORIZED_KEYS" - echo "Success: insecure key has been added to $AUTHORIZED_KEYS" - cat <<-EOF - - +------------------------------------------------------------------------------+ - | Insecure SSH key installed | - | | - | DO NOT expose port 22 on the Internet unless you know what you are doing! | - | | - | Use the private key below to connect with user root | - +------------------------------------------------------------------------------+ - - EOF - cat /etc/insecure_key - echo -e "\n\n" -fi diff --git a/image/services/sshd/keys/insecure_key b/image/services/sshd/keys/insecure_key deleted file mode 100644 index 36498f60b..000000000 --- a/image/services/sshd/keys/insecure_key +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpQIBAAKCAQEA1ZswRub+3DvSEnBiyM5YRpRzRYV88vO1X2j867u6pyCHUNXv -RRCr7ahMLPIVYsZwlHb4sF+Zb3DJOBH+E265o93chdMxbWG44k0spf10JRevA0JX -NrEwHR8vesCR74e5MuddbSic88lsEqnnn+Fo3lStvE6nBp6tbqdEu7GhTtHSYejn -wwINnA5ocsHkd1YE9L2Scqw1e4bXveTAQnSvhqe33QshGXFpt0tQwRWngah887f2 -P54wFSm2C/UyFT7pvIjINKzIi4vUoXz/nU+V7neTmt3XDdjloYg3ycOaX4RSVneO -HCf7hkcEKbzbPzzSrGAAYYC5UzFB+ImsIbtV2wIDAQABAoIBAQCjROxgtX2Gft7y -Ix8Ol9IXmK6HLCI2XZt7ovb3hFWGGzHy0qMBql2P2Tzoed1o038Hq+woe9n+uTnE -dtQ6rD6PByzgyW2VSsWTjCOdeJ5HH9Qw7ItXDZZWHBkhfYHOkXI4e2oI3qshGAtY -NLALn7KVhioJriCyyaSM2KOLx5khcY+EJ1inQfwQJKqPGsdKc72liz07T8ifRj+m -NLKtwrxlK3IXYfIdgLp/1pCKdrC80DhprMsD4xvNgq4pCR9jd4FoqM9t/Up5ppTm -+p6A/bDwdIPh6cFFeyMP+G3+bTlW1Gg7RLoNCc6qh53WWVgEOQqdLHcQ8Ge4RLmb -wLUmnRuRAoGBAPfXYfjpPZi8rPIQpux13Bs7xaS1/Fa9WqrEfrPptFdUVHeFCGY8 -qOUVewPviHdbs0nB71Ynk9/e96agFYijQdqTQzVnpYI4i8GiGk5gPMiB2UYeJ/HZ -mIB3jtWyf6Z/GO0hJ1a6mX0XD3zJGNqFaiwqaYgdO1Fwh9gcH3O2lHyjAoGBANyj -TGDBYHpxPu6uKcGreLd0SgO61PEj7aOSNfrBB2PK83A+zjZCFZRIWqjfrkxGG6+a -2WuHbEHuCGvu2V5juHYxbAD/38iV/lQl/2xyvN1eR/baE3US06qn6idxjnmeNZDy -DelAx1RGuEvLX1TNAzDTxBwYyzH3W2RpKAUAD11pAoGAN38YJhd8Pn5JL68A4cQG -dGau/BHwHjAqZEC5qmmzgzaT72tvlQ0SOLHVqOzzHt7+x45QnHciSqfvxnTkPYNp -FJuTGhtKWV12FfbJczFjivZgg63u/d3eoy2iY0GkCdE98KNS3r3L7tHCGwwgr5Xe -T2Nz3BHHnZXYJVEuzcddeocCgYEAnhDjPAHtw2p0Inxlb9kPb6aBC/ECcwtBSUkL -IOy/BZA1HPnxs89eNFAtmwQ8k2o6lXDDSJTJSuZj5CdGVKfuU8aOUJz/Tm2eudxL -A/+jLJhJyCBthhcJyx3m04E4CAr+5ytyKeP9qXPMvoghcNg66/UabuKYV+CU+feX -8xUa7NkCgYEAlX8HGvWMmiG+ZRFB//3Loy87bBxGlN0pUtCEScabZxdB2HkI9Vp7 -Yr67QIZ3y7T88Mhkwam54JCjiV+3TZbSyRMOjkqf7UhTCZC6hHNqdUnlpv4bJWeW -i5Eun8ltYxBnemNc2QGxA4r+KCspi+pRvWNGzL3PFVBGXiLsmOMul78= ------END RSA PRIVATE KEY----- diff --git a/image/services/sshd/keys/insecure_key.ppk b/image/services/sshd/keys/insecure_key.ppk deleted file mode 100644 index 9e0ab1c78..000000000 --- a/image/services/sshd/keys/insecure_key.ppk +++ /dev/null @@ -1,26 +0,0 @@ -PuTTY-User-Key-File-2: ssh-rsa -Encryption: none -Comment: imported-openssh-key -Public-Lines: 6 -AAAAB3NzaC1yc2EAAAADAQABAAABAQDVmzBG5v7cO9IScGLIzlhGlHNFhXzy87Vf -aPzru7qnIIdQ1e9FEKvtqEws8hVixnCUdviwX5lvcMk4Ef4Tbrmj3dyF0zFtYbji -TSyl/XQlF68DQlc2sTAdHy96wJHvh7ky511tKJzzyWwSqeef4WjeVK28TqcGnq1u -p0S7saFO0dJh6OfDAg2cDmhyweR3VgT0vZJyrDV7hte95MBCdK+Gp7fdCyEZcWm3 -S1DBFaeBqHzzt/Y/njAVKbYL9TIVPum8iMg0rMiLi9ShfP+dT5Xud5Oa3dcN2OWh -iDfJw5pfhFJWd44cJ/uGRwQpvNs/PNKsYABhgLlTMUH4iawhu1Xb -Private-Lines: 14 -AAABAQCjROxgtX2Gft7yIx8Ol9IXmK6HLCI2XZt7ovb3hFWGGzHy0qMBql2P2Tzo -ed1o038Hq+woe9n+uTnEdtQ6rD6PByzgyW2VSsWTjCOdeJ5HH9Qw7ItXDZZWHBkh -fYHOkXI4e2oI3qshGAtYNLALn7KVhioJriCyyaSM2KOLx5khcY+EJ1inQfwQJKqP -GsdKc72liz07T8ifRj+mNLKtwrxlK3IXYfIdgLp/1pCKdrC80DhprMsD4xvNgq4p -CR9jd4FoqM9t/Up5ppTm+p6A/bDwdIPh6cFFeyMP+G3+bTlW1Gg7RLoNCc6qh53W -WVgEOQqdLHcQ8Ge4RLmbwLUmnRuRAAAAgQD312H46T2YvKzyEKbsddwbO8WktfxW -vVqqxH6z6bRXVFR3hQhmPKjlFXsD74h3W7NJwe9WJ5Pf3vemoBWIo0Hak0M1Z6WC -OIvBohpOYDzIgdlGHifx2ZiAd47Vsn+mfxjtISdWupl9Fw98yRjahWosKmmIHTtR -cIfYHB9ztpR8owAAAIEA3KNMYMFgenE+7q4pwat4t3RKA7rU8SPto5I1+sEHY8rz -cD7ONkIVlEhaqN+uTEYbr5rZa4dsQe4Ia+7ZXmO4djFsAP/fyJX+VCX/bHK83V5H -9toTdRLTqqfqJ3GOeZ41kPIN6UDHVEa4S8tfVM0DMNPEHBjLMfdbZGkoBQAPXWkA -AACBAJV/Bxr1jJohvmURQf/9y6MvO2wcRpTdKVLQhEnGm2cXQdh5CPVae2K+u0CG -d8u0/PDIZMGpueCQo4lft02W0skTDo5Kn+1IUwmQuoRzanVJ5ab+GyVnlouRLp/J -bWMQZ3pjXNkBsQOK/igrKYvqUb1jRsy9zxVQRl4i7JjjLpe/ -Private-MAC: ef1e472b5254ae2c5319a522d39ad31d432dde75 diff --git a/image/services/sshd/keys/insecure_key.pub b/image/services/sshd/keys/insecure_key.pub deleted file mode 100644 index c938868de..000000000 --- a/image/services/sshd/keys/insecure_key.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDVmzBG5v7cO9IScGLIzlhGlHNFhXzy87VfaPzru7qnIIdQ1e9FEKvtqEws8hVixnCUdviwX5lvcMk4Ef4Tbrmj3dyF0zFtYbjiTSyl/XQlF68DQlc2sTAdHy96wJHvh7ky511tKJzzyWwSqeef4WjeVK28TqcGnq1up0S7saFO0dJh6OfDAg2cDmhyweR3VgT0vZJyrDV7hte95MBCdK+Gp7fdCyEZcWm3S1DBFaeBqHzzt/Y/njAVKbYL9TIVPum8iMg0rMiLi9ShfP+dT5Xud5Oa3dcN2OWhiDfJw5pfhFJWd44cJ/uGRwQpvNs/PNKsYABhgLlTMUH4iawhu1Xb baseimage-docker-insecure-key diff --git a/image/services/sshd/sshd.runit b/image/services/sshd/sshd.runit deleted file mode 100755 index 7f6649215..000000000 --- a/image/services/sshd/sshd.runit +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -exec /usr/sbin/sshd -D diff --git a/image/services/sshd/sshd.sh b/image/services/sshd/sshd.sh deleted file mode 100755 index 8d26f87d6..000000000 --- a/image/services/sshd/sshd.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/bash -set -e -source /bd_build/buildconfig -set -x - -SSHD_BUILD_PATH=/bd_build/services/sshd - -## Install the SSH server. -$minimal_apt_get_install openssh-server -mkdir /var/run/sshd -mkdir /etc/service/sshd -touch /etc/service/sshd/down -cp $SSHD_BUILD_PATH/sshd.runit /etc/service/sshd/run -cp $SSHD_BUILD_PATH/sshd_config /etc/ssh/sshd_config -cp $SSHD_BUILD_PATH/00_regen_ssh_host_keys.sh /etc/my_init.d/ - -## Install default SSH key for root and app. -mkdir -p /root/.ssh -chmod 700 /root/.ssh -chown root:root /root/.ssh -cp $SSHD_BUILD_PATH/keys/insecure_key.pub /etc/insecure_key.pub -cp $SSHD_BUILD_PATH/keys/insecure_key /etc/insecure_key -chmod 644 /etc/insecure_key* -chown root:root /etc/insecure_key* -cp $SSHD_BUILD_PATH/enable_insecure_key /usr/sbin/ diff --git a/image/services/sshd/sshd_config b/image/services/sshd/sshd_config deleted file mode 100644 index 5e244d8ac..000000000 --- a/image/services/sshd/sshd_config +++ /dev/null @@ -1,132 +0,0 @@ -# $OpenBSD: sshd_config,v 1.80 2008/07/02 02:24:18 djm Exp $ - -# This is the sshd server system-wide configuration file. See -# sshd_config(5) for more information. - -# This sshd was compiled with PATH=/usr/bin:/bin:/usr/sbin:/sbin - -# The strategy used for options in the default sshd_config shipped with -# OpenSSH is to specify options with their default value where -# possible, but leave them commented. Uncommented options change a -# default value. - -UseDNS no - -#Port 22 -#AddressFamily any -#ListenAddress 0.0.0.0 -#ListenAddress :: - -# Disable legacy (protocol version 1) support in the server for new -# installations. In future the default will change to require explicit -# activation of protocol 1 -Protocol 2 - -# HostKey for protocol version 1 -#HostKey /etc/ssh_host_key -# HostKeys for protocol version 2 -#HostKey /etc/ssh_host_rsa_key -#HostKey /etc/ssh_host_dsa_key - -# Lifetime and size of ephemeral version 1 server key -#KeyRegenerationInterval 1h -#ServerKeyBits 1024 - -# Logging -# obsoletes QuietMode and FascistLogging -SyslogFacility AUTHPRIV -#LogLevel INFO - -# Authentication: - -#LoginGraceTime 2m -#PermitRootLogin yes -#StrictModes yes -#MaxAuthTries 6 -#MaxSessions 10 - -#RSAAuthentication yes -#PubkeyAuthentication yes -#AuthorizedKeysFile .ssh/authorized_keys - -# For this to work you will also need host keys in /etc/ssh_known_hosts -#RhostsRSAAuthentication no -# similar for protocol version 2 -#HostbasedAuthentication no -# Change to yes if you don't trust ~/.ssh/known_hosts for -# RhostsRSAAuthentication and HostbasedAuthentication -#IgnoreUserKnownHosts no -# Don't read the user's ~/.rhosts and ~/.shosts files -#IgnoreRhosts yes - -# To disable tunneled clear text passwords, change to no here! Also, -# remember to set the UsePAM setting to 'no'. -#PasswordAuthentication no -#PermitEmptyPasswords no - -# SACL options -# The default for the SACLSupport option is now "no", as this option has been -# depreciated in favor of SACL enforcement in the PAM configuration (/etc/pam.d/sshd). -#SACLSupport no - -# Change to no to disable s/key passwords -# Disabled for passenger-docker. We only allow key authentication. -ChallengeResponseAuthentication no - -# Kerberos options -#KerberosAuthentication no -#KerberosOrLocalPasswd yes -#KerberosTicketCleanup yes - -# GSSAPI options -#GSSAPIAuthentication no -#GSSAPICleanupCredentials yes -#GSSAPIStrictAcceptorCheck yes -#GSSAPIKeyExchange no - -# Set this to 'yes' to enable PAM authentication, account processing, -# and session processing. If this is enabled, PAM authentication will -# be allowed through the ChallengeResponseAuthentication and -# PasswordAuthentication. Depending on your PAM configuration, -# PAM authentication via ChallengeResponseAuthentication may bypass -# the setting of "PermitRootLogin without-password". -# If you just want the PAM account and session checks to run without -# PAM authentication, then enable this but set PasswordAuthentication -# and ChallengeResponseAuthentication to 'no'. -# Also, PAM will deny null passwords by default. If you need to allow -# null passwords, add the " nullok" option to the end of the -# securityserver.so line in /etc/pam.d/sshd. -#UsePAM yes - -#AllowAgentForwarding yes -#AllowTcpForwarding yes -#GatewayPorts no -X11Forwarding yes -#X11DisplayOffset 10 -#X11UseLocalhost yes -#PrintMotd yes -#PrintLastLog yes -#TCPKeepAlive yes -#UseLogin no -#UsePrivilegeSeparation yes -#PermitUserEnvironment no -#Compression delayed -#ClientAliveInterval 0 -#ClientAliveCountMax 3 -#UseDNS yes -#PidFile /var/run/sshd.pid -#MaxStartups 10 -#PermitTunnel no -#ChrootDirectory none - -# no default banner path -#Banner none - -# override default of no subsystems -Subsystem sftp /usr/lib/openssh/sftp-server - -# Example of overriding settings on a per-user basis -#Match User anoncvs -# X11Forwarding no -# AllowTcpForwarding no -# ForceCommand cvs server diff --git a/image/system_services.sh b/image/system_services.sh index a3666a21d..c93554b40 100755 --- a/image/system_services.sh +++ b/image/system_services.sh @@ -24,8 +24,5 @@ $minimal_apt_get_install runit ## Install a syslog daemon and logrotate. [ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh || true -## Install the SSH server. -[ "$DISABLE_SSH" -eq 0 ] && /bd_build/services/sshd/sshd.sh || true - ## Install cron daemon. [ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true From df8afa696f60625b1d8d5f935a0c778a78b047c5 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:45:13 +0100 Subject: [PATCH 07/83] updated maintainer --- image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/image/Dockerfile b/image/Dockerfile index 7b85ed27d..44050eac1 100644 --- a/image/Dockerfile +++ b/image/Dockerfile @@ -1,5 +1,5 @@ FROM ubuntu:16.04 -MAINTAINER Phusion +MAINTAINER Zsolt Ero ADD . /bd_build From bdb2f305df4c5b1d46cb16e97e27a1b2a5ded1eb Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:46:25 +0100 Subject: [PATCH 08/83] syslog original added --- .../syslog-ng/syslog-ng.conf.original | 162 ++++++++++++++++++ 1 file changed, 162 insertions(+) create mode 100644 image/services/syslog-ng/syslog-ng.conf.original diff --git a/image/services/syslog-ng/syslog-ng.conf.original b/image/services/syslog-ng/syslog-ng.conf.original new file mode 100644 index 000000000..a8af03a59 --- /dev/null +++ b/image/services/syslog-ng/syslog-ng.conf.original @@ -0,0 +1,162 @@ +@version: 3.5 +@include "scl.conf" +@include "`scl-root`/system/tty10.conf" + +# Syslog-ng configuration file, compatible with default Debian syslogd +# installation. + +# First, set some global options. +options { chain_hostnames(off); flush_lines(0); use_dns(no); use_fqdn(no); + owner("root"); group("adm"); perm(0640); stats_freq(0); + bad_hostname("^gconfd$"); +}; + +######################## +# Sources +######################## +# This is the default behavior of sysklogd package +# Logs may come from unix stream, but not from another machine. +# +source s_src { + system(); + internal(); +}; + +# If you wish to get logs from remote machine you should uncomment +# this and comment the above source line. +# +#source s_net { tcp(ip(127.0.0.1) port(1000)); }; + +######################## +# Destinations +######################## +# First some standard logfile +# +destination d_auth { file("/var/log/auth.log"); }; +destination d_cron { file("/var/log/cron.log"); }; +destination d_daemon { file("/var/log/daemon.log"); }; +destination d_kern { file("/var/log/kern.log"); }; +destination d_lpr { file("/var/log/lpr.log"); }; +destination d_mail { file("/var/log/mail.log"); }; +destination d_syslog { file("/var/log/syslog"); }; +destination d_user { file("/var/log/user.log"); }; +destination d_uucp { file("/var/log/uucp.log"); }; + +# This files are the log come from the mail subsystem. +# +destination d_mailinfo { file("/var/log/mail.info"); }; +destination d_mailwarn { file("/var/log/mail.warn"); }; +destination d_mailerr { file("/var/log/mail.err"); }; + +# Logging for INN news system +# +destination d_newscrit { file("/var/log/news/news.crit"); }; +destination d_newserr { file("/var/log/news/news.err"); }; +destination d_newsnotice { file("/var/log/news/news.notice"); }; + +# Some `catch-all' logfiles. +# +destination d_debug { file("/var/log/debug"); }; +destination d_error { file("/var/log/error"); }; +destination d_messages { file("/var/log/messages"); }; + +# The root's console. +# +destination d_console { usertty("root"); }; + +# Virtual console. +# +destination d_console_all { file(`tty10`); }; + +# The named pipe /dev/xconsole is for the nsole' utility. To use it, +# you must invoke nsole' with the -file' option: +# +# $ xconsole -file /dev/xconsole [...] +# +destination d_xconsole { pipe("/dev/xconsole"); }; + +# Send the messages to an other host +# +#destination d_net { tcp("127.0.0.1" port(1000) log_fifo_size(1000)); }; + +# Debian only +destination d_ppp { file("/var/log/ppp.log"); }; + +######################## +# Filters +######################## +# Here's come the filter options. With this rules, we can set which +# message go where. + +filter f_dbg { level(debug); }; +filter f_info { level(info); }; +filter f_notice { level(notice); }; +filter f_warn { level(warn); }; +filter f_err { level(err); }; +filter f_crit { level(crit .. emerg); }; + +filter f_debug { level(debug) and not facility(auth, authpriv, news, mail); }; +filter f_error { level(err .. emerg) ; }; +filter f_messages { level(info,notice,warn) and + not facility(auth,authpriv,cron,daemon,mail,news); }; + +filter f_auth { facility(auth, authpriv) and not filter(f_debug); }; +filter f_cron { facility(cron) and not filter(f_debug); }; +filter f_daemon { facility(daemon) and not filter(f_debug); }; +filter f_kern { facility(kern) and not filter(f_debug); }; +filter f_lpr { facility(lpr) and not filter(f_debug); }; +filter f_local { facility(local0, local1, local3, local4, local5, + local6, local7) and not filter(f_debug); }; +filter f_mail { facility(mail) and not filter(f_debug); }; +filter f_news { facility(news) and not filter(f_debug); }; +filter f_syslog3 { not facility(auth, authpriv, mail) and not filter(f_debug); }; +filter f_user { facility(user) and not filter(f_debug); }; +filter f_uucp { facility(uucp) and not filter(f_debug); }; + +filter f_cnews { level(notice, err, crit) and facility(news); }; +filter f_cother { level(debug, info, notice, warn) or facility(daemon, mail); }; + +filter f_ppp { facility(local2) and not filter(f_debug); }; +filter f_console { level(warn .. emerg); }; + +######################## +# Log paths +######################## +log { source(s_src); filter(f_auth); destination(d_auth); }; +log { source(s_src); filter(f_cron); destination(d_cron); }; +log { source(s_src); filter(f_daemon); destination(d_daemon); }; +log { source(s_src); filter(f_kern); destination(d_kern); }; +log { source(s_src); filter(f_lpr); destination(d_lpr); }; +log { source(s_src); filter(f_syslog3); destination(d_syslog); }; +log { source(s_src); filter(f_user); destination(d_user); }; +log { source(s_src); filter(f_uucp); destination(d_uucp); }; + +log { source(s_src); filter(f_mail); destination(d_mail); }; +#log { source(s_src); filter(f_mail); filter(f_info); destination(d_mailinfo); }; +#log { source(s_src); filter(f_mail); filter(f_warn); destination(d_mailwarn); }; +#log { source(s_src); filter(f_mail); filter(f_err); destination(d_mailerr); }; + +log { source(s_src); filter(f_news); filter(f_crit); destination(d_newscrit); }; +log { source(s_src); filter(f_news); filter(f_err); destination(d_newserr); }; +log { source(s_src); filter(f_news); filter(f_notice); destination(d_newsnotice); }; +#log { source(s_src); filter(f_cnews); destination(d_console_all); }; +#log { source(s_src); filter(f_cother); destination(d_console_all); }; + +#log { source(s_src); filter(f_ppp); destination(d_ppp); }; + +log { source(s_src); filter(f_debug); destination(d_debug); }; +log { source(s_src); filter(f_error); destination(d_error); }; +log { source(s_src); filter(f_messages); destination(d_messages); }; + +log { source(s_src); filter(f_console); destination(d_console_all); + destination(d_xconsole); }; +log { source(s_src); filter(f_crit); destination(d_console); }; + +# All messages send to a remote site +# +#log { source(s_src); destination(d_net); }; + +### +# Include all config files in /etc/syslog-ng/conf.d/ +### +@include "/etc/syslog-ng/conf.d/*.conf" From 5c6722d0b5c3f3a63d2ee11392b1d78a5874abe4 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:50:26 +0100 Subject: [PATCH 09/83] added original logrotate conf --- image/services/syslog-ng/logrotate.conf.orig | 36 ++++++++++++++++++++ 1 file changed, 36 insertions(+) create mode 100644 image/services/syslog-ng/logrotate.conf.orig diff --git a/image/services/syslog-ng/logrotate.conf.orig b/image/services/syslog-ng/logrotate.conf.orig new file mode 100644 index 000000000..436713ddb --- /dev/null +++ b/image/services/syslog-ng/logrotate.conf.orig @@ -0,0 +1,36 @@ +# see "man logrotate" for details +# rotate log files weekly +weekly + +# use the syslog group by default, since this is the owning group +# of /var/log/syslog. +su root syslog + +# keep 4 weeks worth of backlogs +rotate 4 + +# create new (empty) log files after rotating old ones +create + +# uncomment this if you want your log files compressed +#compress + +# packages drop log rotation information into this directory +include /etc/logrotate.d + +# no packages own wtmp, or btmp -- we'll rotate them here +/var/log/wtmp { + missingok + monthly + create 0664 root utmp + rotate 1 +} + +/var/log/btmp { + missingok + monthly + create 0660 root utmp + rotate 1 +} + +# system-specific logs may be configured here From b5ce8862b4f43579745814fae561e5a24da2203a Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 14:55:58 +0100 Subject: [PATCH 10/83] fix logrotate permission issue --- image/services/syslog-ng/syslog-ng.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/image/services/syslog-ng/syslog-ng.sh b/image/services/syslog-ng/syslog-ng.sh index f6557568f..6b71ee0bf 100755 --- a/image/services/syslog-ng/syslog-ng.sh +++ b/image/services/syslog-ng/syslog-ng.sh @@ -22,3 +22,6 @@ cp $SYSLOG_NG_BUILD_PATH/syslog-forwarder.runit /etc/service/syslog-forwarder/ru ## Install logrotate. $minimal_apt_get_install logrotate cp $SYSLOG_NG_BUILD_PATH/logrotate_syslogng /etc/logrotate.d/syslog-ng + +# fix logrotate permission issue +sed -i 's/^su root syslog/su root adm/' /etc/logrotate.conf From 7a0db8bf815c878af22dacbcb0b9aa7b8165bfb0 Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 15:54:07 +0100 Subject: [PATCH 11/83] cron passwd rename fix --- image/services/cron/cron.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/image/services/cron/cron.sh b/image/services/cron/cron.sh index 7d884b9e2..dcbf5888b 100755 --- a/image/services/cron/cron.sh +++ b/image/services/cron/cron.sh @@ -1,7 +1,6 @@ #!/bin/bash set -e source /bd_build/buildconfig -set -x $minimal_apt_get_install cron mkdir /etc/service/cron @@ -10,8 +9,9 @@ cp /bd_build/services/cron/cron.runit /etc/service/cron/run ## Remove useless cron entries. # Checks for lost+found and scans for mtab. -rm -f /etc/cron.daily/standard -rm -f /etc/cron.daily/upstart -rm -f /etc/cron.daily/dpkg -rm -f /etc/cron.daily/password -rm -f /etc/cron.weekly/fstrim +rm /etc/cron.daily/apt-compat +rm /etc/cron.daily/dpkg +rm /etc/cron.daily/passwd +rm /etc/cron.daily/standard +rm /etc/cron.daily/upstart +rm /etc/cron.weekly/fstrim From a45095c7a21b49675e6f8b4b84202c61d930a9cc Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 15:54:29 +0100 Subject: [PATCH 12/83] prepare hold initscripts --- image/prepare.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/image/prepare.sh b/image/prepare.sh index 283fc1285..7effd4b62 100755 --- a/image/prepare.sh +++ b/image/prepare.sh @@ -27,6 +27,9 @@ ln -sf /bin/true /sbin/initctl dpkg-divert --local --rename --add /usr/bin/ischroot ln -sf /bin/true /usr/bin/ischroot +# never upgrade initscripts +apt-mark hold initscripts + # apt-utils fix for Ubuntu 16.04 $minimal_apt_get_install apt-utils From b55a3d0aa7d6e8fcad46136637409bcecfb6604c Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 15:54:38 +0100 Subject: [PATCH 13/83] locale gen added LC_ALL --- image/prepare.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/image/prepare.sh b/image/prepare.sh index 7effd4b62..13ceb6ebf 100755 --- a/image/prepare.sh +++ b/image/prepare.sh @@ -44,7 +44,9 @@ apt-get dist-upgrade -y --no-install-recommends ## Fix locale. $minimal_apt_get_install language-pack-en -locale-gen en_US -update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 +locale-gen --purge en_US.UTF-8 +update-locale LANG=en_US.UTF-8 LC_CTYPE=en_US.UTF-8 LC_ALL=en_US.UTF-8 echo -n en_US.UTF-8 > /etc/container_environment/LANG echo -n en_US.UTF-8 > /etc/container_environment/LC_CTYPE +echo -n en_US.UTF-8 > /etc/container_environment/LC_ALL + From 1b5e30c202690f0870899bb8d1c9e9b65319e61a Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 16:00:54 +0100 Subject: [PATCH 14/83] removed cron.daily/standard --- image/services/cron/cron.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/image/services/cron/cron.sh b/image/services/cron/cron.sh index dcbf5888b..6515df620 100755 --- a/image/services/cron/cron.sh +++ b/image/services/cron/cron.sh @@ -12,6 +12,5 @@ cp /bd_build/services/cron/cron.runit /etc/service/cron/run rm /etc/cron.daily/apt-compat rm /etc/cron.daily/dpkg rm /etc/cron.daily/passwd -rm /etc/cron.daily/standard rm /etc/cron.daily/upstart rm /etc/cron.weekly/fstrim From 7cc7976ea3e5e204444b09bcd1cbbfd7aabf6d5f Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 16:09:51 +0100 Subject: [PATCH 15/83] cron fixes --- image/services/cron/cron.sh | 2 +- image/system_services.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/image/services/cron/cron.sh b/image/services/cron/cron.sh index 6515df620..91b9378b1 100755 --- a/image/services/cron/cron.sh +++ b/image/services/cron/cron.sh @@ -1,6 +1,7 @@ #!/bin/bash set -e source /bd_build/buildconfig +set -x $minimal_apt_get_install cron mkdir /etc/service/cron @@ -12,5 +13,4 @@ cp /bd_build/services/cron/cron.runit /etc/service/cron/run rm /etc/cron.daily/apt-compat rm /etc/cron.daily/dpkg rm /etc/cron.daily/passwd -rm /etc/cron.daily/upstart rm /etc/cron.weekly/fstrim diff --git a/image/system_services.sh b/image/system_services.sh index c93554b40..b1c0a545c 100755 --- a/image/system_services.sh +++ b/image/system_services.sh @@ -21,8 +21,9 @@ ln -s /etc/container_environment.sh /etc/profile.d/ ## Install runit. $minimal_apt_get_install runit +## Install cron daemon. +[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true + ## Install a syslog daemon and logrotate. [ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh || true -## Install cron daemon. -[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true From 5ee61dc1824c8444343edd5638c0584448231a3c Mon Sep 17 00:00:00 2001 From: Zsolt Ero Date: Thu, 24 Nov 2016 16:17:19 +0100 Subject: [PATCH 16/83] cleaned up git --- .editorconfig | 11 - CONTRIBUTING.md | 7 - Changelog.md | 149 --------- Makefile | 29 -- README_ZH_cn_.md | 566 -------------------------------- README_zh_tw.md | 567 --------------------------------- Vagrantfile | 54 ---- install-tools.sh | 12 - test/runner.sh | 42 --- test/test.sh | 22 -- tools/README.md | 1 - tools/baseimage-docker-nsenter | Bin 774872 -> 0 bytes tools/docker-bash | 29 -- tools/docker-ssh | 81 ----- 14 files changed, 1570 deletions(-) delete mode 100644 .editorconfig delete mode 100644 CONTRIBUTING.md delete mode 100644 Changelog.md delete mode 100644 Makefile delete mode 100644 README_ZH_cn_.md delete mode 100644 README_zh_tw.md delete mode 100644 Vagrantfile delete mode 100755 install-tools.sh delete mode 100755 test/runner.sh delete mode 100755 test/test.sh delete mode 100644 tools/README.md delete mode 100755 tools/baseimage-docker-nsenter delete mode 100755 tools/docker-bash delete mode 100755 tools/docker-ssh diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 5dc6d24e4..000000000 --- a/.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -# EditorConfig is awesome: http://EditorConfig.org - -# top-most EditorConfig file -root = true - -# Unix-style newlines with a newline ending every file -[*] -end_of_line = lf -insert_final_newline = true -indent_size = 4 -indent_style = tab diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 1feaa45ba..000000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,7 +0,0 @@ -Hey, thanks for wanting to contribute to baseimage-docker. :) - -If you have a question, please use the [discussion forum](https://groups.google.com/d/forum/passenger-docker). The Github issue tracker is only for **bug reports and feature requests**. - -If you want to develop baseimage-docker, use the Vagrantfile in the repository. It will setup an Ubuntu VM with Docker installed in it. Use the Makefile to build the Docker image. - -All development happens on the `next` branch. The `master` branch is supposed to point to the latest stable release, because users read documentation from the `master` branch. diff --git a/Changelog.md b/Changelog.md deleted file mode 100644 index 622ef1137..000000000 --- a/Changelog.md +++ /dev/null @@ -1,149 +0,0 @@ -## 0.9.19 (release date: 2016-07-08) - - * Upgraded to Ubuntu 16.04. Thanks to Pierre Jacomet for submitting this patch. - * During shutdown, repeatedly tell Runit to shutdown services in order to workaround a potential race condition in Runit itself. Closes GH-315. Thanks to Chris Kite for submitting this patch. - * Fixed a problem in PAM which may cause chpasswd and related tools to fail. This is caused by Docker bug 6345 which is already closed, but for some reason the problem still persists. Closes GH-181. Thanks to Michael Zedeler for submitting the patch. - * Fixed the syslog-ng logrotate script to correctly restart the syslog-to-Docker-logs forwarder. Closes GH-292. Thanks to Ernestas Lukoševičius for submitting the patch. - - -## 0.9.18 (release date: 2015-12-08) - - * The latest OpenSSL updates have been pulled in. This fixes [CVE-2015-3193](https://www.openssl.org/news/secadv/20151203.txt) and a few others. Upgrading is strongly recommended. - * Fixes disabling all services. Thanks to Enderson Maia. - - -## 0.9.17 (release date: 2015-07-15) - - * The latest OpenSSL updates have been pulled in. This fixes [CVE-2015-1793](http://openssl.org/news/secadv_20150709.txt). Upgrading is strongly recommended. - * Removed nano and replaced vim with vim-tiny. This reduces Baseimage-docker's virtual size by 42 MB. - * Fixed an issue in `my_init` which could cause it to hang during shutdown. Thanks to Joe "SAPikachu" Hu for contributing the fix. Closes GH-151. - * When `my_init` generates `/etc/container_environment.sh`, it now ensures that environment variable names do not include any characters unsupported by Bash. Unsupported characters are now replaced with underscores. This fixes compatibility issues with Docker Compose. Closes GH-230. - * `my_init` no longer reads from and writes to `/etc/container_environment` if that directory does not exist. Previously it would abort with an error. This change makes it easier to reuse `my_init` in other (non-Baseimage-docker-based) projects without having to modify it. - * Baseimage-docker no longer sets the HOME environment variable by default. We used to set HOME by default to work around [Docker issue 2968](https://github.com/docker/docker/issues/2968) where HOME defaults to /, but this issue is now fixed. Furthermore, the fact that we set HOME interfered with the USER stanza: USER would no longer set HOME. So we got rid of our HOME variable. Closes GH-231. - * Some unnecessary Ubuntu cron jobs have been removed. Closes GH-205. - * Syslog-ng no longer forwards messages to /dev/tty10. Closes GH-222. - * It is now possible to build your own Baseimage-docker variant that has cron, syslog or sshd disabled. Thanks to Enderson Tadeu S. Maia. Closes GH-182. - -## 0.9.16 (release date: 2015-01-20) - - * `docker exec` is now the default and recommended mechanism for running commands in the container. SSH is now disabled by default, but is still supported for those cases where "docker exec" is not appropriate. Closes GH-168. - * All syslog output is now forwarded to `docker logs`. Closes GH-123. - * The workaround for Docker bug 2267 (the inability to modify /etc/hosts) has been removed, because it has been fixed upstream. Closes GH-155. - * Logrotate now reloads syslog-ng properly. Closes GH-167. - * Fixed some locale issues. Closes GH-178. Thanks to David J. M. Karlsen. - * Fixed problems with cron. Closes GH-115. - * Contribution by Bryan Bishop. - -## 0.9.15 (release date: 2014-10-03) - - * Fixed the setuid bit on /usr/bin/sudo. This problem was caused by Docker bug #6828. - -## 0.9.14 (release date: 2014-10-01) - - * Installed all the latest Ubuntu security updates. This patches Shellshock, among other things. - * Some documentation updates by andreamtp. - -## 0.9.13 (release date: 2014-08-22) - - * Fixed `my_init` not properly exiting with a non-zero exit status when Ctrl-C is pressed. - * The GID of the `docker_env` group has been changed from 1000 to 8377, in order to avoid GID conflicts with any groups that you might want to introduce inside the container. - * The syslog-ng socket is now deleted before starting the syslog-ng daemon, to avoid the daemon from failing to start due to garbage on the filesystem. Thanks to Kingdon Barrett. Closes GH-129. - * Typo fixes by Arkadi Shishlov. - -## 0.9.12 (release date: 2014-07-24) - - * We now officially support `nsenter` as an alternative way to login to the container. With official support, we mean that we've provided extensive documentation on how to use `nsenter`, as well as related convenience tools. However, because `nsenter` has various issues, and for backward compatibility reasons, we still support SSH. Please refer to the README for details about `nsenter`, and what the pros and cons are compared to SSH. - * The `docker-bash` tool has been modified to use `nsenter` instead of SSH. - * What was previously the `docker-bash` tool, has now been renamed to `docker-ssh`. It now also works on a regular sh shell too, instead of bash specifically. - * Added a workaround for Docker's inability to modify /etc/hosts in the container ([Docker bug 2267](https://github.com/dotcloud/docker/issues/2267)). Please refer to the README for details. - * Fixed an issue with SSH X11 forwarding. Thanks to Anatoly Bubenkov. Closes GH-105. - * The init system now prints its own log messages to stderr. Thanks to mephi42. Closes GH-106. - -## 0.9.11 (release date: 2014-06-24) - - * Introduced the `docker-bash` tool. This is a shortcut tool for logging into a container using SSH. Usage: `docker-bash `. See the README for details. - * Fixed various process waiting issues in `my_init`. Closes GH-27, GH-82 and GH-83. Thanks to André Luiz dos Santos and Paul Annesley. - * The `ca-certificates` package is now installed 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. - * Output print by Runit services are now redirected to the Docker logs instead of to proctitle. Thanks to Paul Annesley. - * Container environment variables are now made available to SSH root shells. If you login with SSH through a non-root account, then container environment variables are only made available if that user is a member of the `docker_env` group. Thanks to Bernard Potocki. - * `add-apt-repository` is now installed by default. Closes GH-74. - * Various minor fixes and contributions thanks to yebyen, John Eckhart, Christoffer Sawicki and Brant Fitzsimmons. - -## 0.9.10 (release date: 2014-05-12) - - * Upgraded to Ubuntu 14.04 (Trusty). We will no longer release images based on 12.04. - Thanks to contributions by mpeterson, Paul Jimenez, Santiago M. Mola and Kingdon Barrett. - * Fixed a problem with my_init not correctly passing child processes' exit status. Fixes GH-45. - * When reading environment variables from /etc/container_environment, the trailing newline (if any) is ignored. This makes commands like this work, without unintentially adding a newline to the environment variable value: - - echo my_value > /etc/container_environment/FOO - - If you intended on adding a newline to the value, ensure you have *two* trailing newlines: - - echo -e "my_value\n" > /etc/container_environment/FOO - * It was not possible to use `docker run -e` to override environment variables defined in /etc/container_environment. This has been fixed (GH-52). Thanks to Stuart Campbell for reporting this bug. - -## 0.9.9 (release date: 2014-03-25) - - * Fixed a problem with rssh. (Slawomir Chodnicki) - * The `INITRD` environment variable is now set in the container by default. This prevents updates to the `initramfs` from running grub or lilo. - * The `ischroot` tool in Ubuntu has been modified to always return true. This prevents updates to the `initscripts` package from breaking /dev/shm. - * Various minor bug fixes, improvements and typo corrections. (Felix Hummel, Laurent Sarrazin, Dung Quang, Amir Gur) - -## 0.9.8 (release date: 2014-02-26) - - * Fixed a regression in `my_init` which causes it to delete environment variables passed from Docker. - * Fixed `my_init` not properly forcing Runit to shut down if Runit appears to refuse to respond to SIGTERM. - -## 0.9.7 (release date: 2014-02-25) - - * Improved and fixed bugs in `my_init` (Thomas LÉVEIL): - * It is now possible to enable the insecure key by passing `--enable-insecure-key` to `my_init`. This allows users to easily enable the insecure key for convenience reasons, without having the insecure key enabled permanently in the image. - * `my_init` now exports environment variables to the directory `/etc/container_environment` and to the files `/etc/container_environment.sh`, `/etc/container_environment.json`. This allows all applications to query what the original environment variables were. It is also possible to change the environment variables in `my_init` by modifying `/etc/container_environment`. More information can be found in the README, section "Environment variables". - * Fixed a bug that causes it not to print messages to stdout when there is no pseudo terminal. This is because Python buffers stdout by default. - * Fixed an incorrectly printed message. - * The insecure key is now also available in PuTTY format. (Thomas LÉVEIL) - * Fixed `enable_insecure_key` removing already installed SSH keys. (Thomas LÉVEIL) - * The baseimage-docker image no longer EXPOSEs any ports by default. The EXPOSE entries were originally there to enable some default guest-to-host port forwarding entries, but in recent Docker versions they changed the meaning of EXPOSE, and now EXPOSE is used for linking containers. As such, we no longer have a reason to EXPOSE any ports by default. Fixes GH-15. - * Fixed syslog-ng not being able to start because of a missing afsql module. Fixes the issue described in [pull request 7](https://github.com/phusion/baseimage-docker/pull/7). - * Removed some default Ubuntu cron jobs which are not useful in Docker containers. - * Added the logrotate service. Fixes GH-22. - * Fixed some warnings in `/etc/my_init.d/00_regen_ssh_host_keys.sh`. - * Fixed some typos in the documentation. (Dr Nic Williams, Tomer Cohen) - -## 0.9.6 (release date: 2014-02-17) - - * Fixed a bug in `my_init`: child processes that have been adopted during execution of init scripts are now properly reaped. - * Much improved `my_init`: - * It is now possible to run and watch a custom command, possibly in addition to running runit. See "Running a one-shot command in the container" in the README. - * It is now possible to skip running startup files such as /etc/rc.local. - * Shutdown is now much faster. It previously took a few seconds, but it is now almost instantaneous. - * It ensures that all processes in the container are properly shut down with SIGTERM, even those that are not direct child processes of `my_init`. - * `setuser` now also sets auxilliary groups, as well as more environment variables such as `USER` and `UID`. - -## 0.9.5 (release date: 2014-02-06) - - * Environment variables are now no longer reset by runit. This is achieved by running `runsvdir` directly instead of through Debian's `runsvdir-start`. - * The insecure SSH key is now disabled by default. You have to explicitly opt-in to use it. - -## 0.9.4 (release date: 2014-02-03) - - * Fixed syslog-ng startup problem. - -## 0.9.3 (release date: 2014-01-31) - - * It looks like Docker changed their Ubuntu 12.04 base image, thereby breaking our Dockerfile. This has been fixed. - * The init system (`/sbin/my_init`) now supports running scripts during startup. You can put startup scripts `/etc/my_init.d`. `/etc/rc.local` is also run during startup. - * To improve security, the base image no longer contains pregenerated SSH host keys. Instead, users of the base image are encouraged to regenerate one in their Dockerfile. If the user does not do that, then random SSH host keys are generated during container boot. - -## 0.9.2 (release date: 2013-12-11) - - * Fixed SFTP support. Thanks Joris van de Donk! - -## 0.9.1 (release date: 2013-11-12) - - * Improved init process script (`/sbin/my_init`): it now handles shutdown correctly. Previously, `docker stop` would not have any effect on `my_init`, causing the whole container to be killed with SIGKILL. The new init process script gracefully shuts down all runit services, then exits. - -## 0.9.0 (release date: 2013-11-12) - - * Initial release diff --git a/Makefile b/Makefile deleted file mode 100644 index 4a07334f4..000000000 --- a/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -NAME = phusion/baseimage -VERSION = 0.9.19 - -.PHONY: all build test tag_latest release ssh - -all: build - -build: - docker build -t $(NAME):$(VERSION) --rm image - -test: - env NAME=$(NAME) VERSION=$(VERSION) ./test/runner.sh - -tag_latest: - docker tag -f $(NAME):$(VERSION) $(NAME):latest - -release: test tag_latest - @if ! docker images $(NAME) | awk '{ print $$2 }' | grep -q -F $(VERSION); then echo "$(NAME) version $(VERSION) is not yet built. Please run 'make build'"; false; fi - @if ! head -n 1 Changelog.md | grep -q 'release date'; then echo 'Please note the release date in Changelog.md.' && false; fi - docker push $(NAME) - @echo "*** Don't forget to create a tag. git tag rel-$(VERSION) && git push origin rel-$(VERSION)" - -ssh: - chmod 600 image/services/sshd/keys/insecure_key - @ID=$$(docker ps | grep -F "$(NAME):$(VERSION)" | awk '{ print $$1 }') && \ - if test "$$ID" = ""; then echo "Container is not running."; exit 1; fi && \ - IP=$$(docker inspect $$ID | grep IPAddr | sed 's/.*: "//; s/".*//') && \ - echo "SSHing into $$IP" && \ - ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i image/services/sshd/keys/insecure_key root@$$IP diff --git a/README_ZH_cn_.md b/README_ZH_cn_.md deleted file mode 100644 index df018c102..000000000 --- a/README_ZH_cn_.md +++ /dev/null @@ -1,566 +0,0 @@ - -# Docker友好的，最小的Ubuntu基础镜像 - -Baseimage-docker是一个特殊的[Docker](http://www.docker.io)镜像，在Docker容器内做了配置，并且可以正确使用。它确实是一个Ubuntu系统, 除此之外进行了如下修订： - - * 为更加友好的支持Docker，做了修订。 - * 在Docker环境下，作为管理工具特别有用。 - * 在[不违反Docker哲学](#docker_single_process)的前提下，能够很容易的运行多进程的机制。 - -可以把它作为自己的基础Docker镜像。 - -Baseimage-docker项目可以直接从Docker的[registry](https://index.docker.io/u/phusion/baseimage/)获取！ - - -### 原生的Ubuntu基础镜像有什么问题呢？ - -原生Ubuntu不是为了在Docker内运行而设计的。它的初始化系统Upstart，假定运行的环境要么是真实的硬件，要么是虚拟的硬件，而不是在Docker容器内。但是在一个Docker的容器内，并不需要一个完整的系统，你需要的只是一个很小的系统。但是如果你不是非常熟悉Unix的系统模型，想要在Docker容器内裁减出最小的系统，会碰到很多难以正确解决的陌生的技术坑。这些坑会引起很多莫名其妙的问题。 - -Baseimage-docker让这一切完美。在"内容"部分描述了所有这些修改。 - - -### 为什么使用baseimage-docker？ - -你自己可以从Dockerfile配置一个原生`ubuntu`镜像，为什么还要多此一举的使用baseimage-docker呢? - - * 配置一个Docker友好的基础系统并不是一个简单的任务。如前所述，过程中会碰到很多坑。当你搞定这些坑之后，只不过是又重新发明了一个baseimage-docker而已。使用baseimage-docker可以免去你这方面需要做的努力。 - * 减少需要正确编写Dockerfile文件的时间。你不用再担心基础系统，可以专注于你自己的技术栈和你的项目。 - * 减少需要运行`docker build`的时间，让你更快的迭代Dockerfile。 - * 减少了重新部署的时的下载时间。Docker只需要在第一次部署的时候下载一次基础镜像。在随后的部署中,只需要改变你下载之后对基础镜像进行修改的部分。 - ------------------------------------------ - -**相关资源** - - [网站](http://phusion.github.io/baseimage-docker/) | - [Github](https://github.com/phusion/baseimage-docker) | - [Docker registry](https://index.docker.io/u/phusion/baseimage/) | - [论坛](https://groups.google.com/d/forum/passenger-docker) | - [Twitter](https://twitter.com/phusion_nl) | - [Blog](http://blog.phusion.nl/) - -**目录** - - * [镜像里面有什么?](#whats_inside) - * [概述](#whats_inside_overview) - * [等等,我认为Docker在一个容器中只能允许运行一个进程?](#docker_single_process) - * [Baseimage-docker更侧重于“胖容器”还是“把容器当作虚拟机”？](#fat_containers) - * [查看baseimage-docker](#inspecting) - * [使用baseimage-docker作为基础镜像](#using) - * [开始](#getting_started) - * [增加额外的后台进程](#adding_additional_daemons) - * [容器启动时运行脚本](#running_startup_scripts) - * [环境变量](#environment_variables) - * [集中定义自己的环境变量](#envvar_central_definition) - * [保存环境变量](#envvar_dumps) - * [修改环境变量](#modifying_envvars) - * [安全性](#envvar_security) - * [容器管理](#container_administration) - * [在一个新容器中运行单条命令](#oneshot) - * [在正在运行的的容器中运行一条命令](#run_inside_existing_container) - * [通过`docer exec`登录容器](#login_docker_exec) - * [用法](#nsenter_usage) - * [使用SSH登录容器](#login_ssh) - * [启用SSH](#enabling_ssh) - * [关于SSH的key](#ssh_keys) - * [只对一个容器使用不安全key](#using_insecure_key_for_one_container_only) - * [永久开启不安全key](#enabling_the_insecure_key_permanently) - * [使用你自己的key](#using_your_own_key) - * [`docker-ssh`工具](#docker_ssh) - * [构建自己的镜像](#building) - * [总结](#conclusion) - ------------------------------------------ - - -## 镜像里面有什么？ - - -### 概述 - -*想看一个里面包含Ruby，Python，Node.js以及Meteor的完整基础镜像？可以看一下[passenger-docker](https://github.com/phusion/passenger-docker)。* - -| 模块 | 为什么包含这些？以及备注 | -| ---------------- | ------------------- | -| Ubuntu 16.04 LTS | 基础系统。 | -| 一个**正确**的初始化进程 | *主要文章：[Docker和PID 1 僵尸进程回收问题](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)*

根据Unix进程模型，[初始化进程](https://en.wikipedia.org/wiki/Init) -- PID 1 -- 继承了所有[孤立的子进程](https://en.wikipedia.org/wiki/Orphan_process)，并且必须[进行回收](https://en.wikipedia.org/wiki/Wait_(system_call))。大多数Docker容器没有一个初始化进程可以正确的完成此操作，随着时间的推移会导致他们的容器出现了大量的[僵尸进程](https://en.wikipedia.org/wiki/Zombie_process)。

而且，`docker stop`发送SIGTERM信号给初始化进程，照理说此信号应该可以停止所有服务。不幸的是由于它们对硬件进行了关闭操作，导致Docker内的大多数初始化系统没有正确执行。这会导致进程强行被SIGKILL信号关闭，从而丧失了一个正确取消初始化设置的机会。这会导致文件损坏。

Baseimage-docker配有一个名为`/sbin/my_init`的初始化进程来同时正确的完成这些任务。 | -| 修复了APT与Docker不兼容的问题 | 详情参见：https://github.com/dotcloud/docker/issues/1024 。 | -| syslog-ng | 对于很多服务－包括kernel自身，都需要一个syslog后台进程，以便可以正确的将log输出到/var/log/syslog中。如果没有运行syslog后台进程，很多重要的信息就会默默的丢失了。

只对本地进行监听。所有syslog信息会被转发给“docker logs”。 | -| logrotate | 定期转存和压缩日志。 | -| SSH服务 | 允许你很容易的登录到容器中进行[查询或管理](#login_ssh)操作。

_SSH**默认是禁用**的，这也是baseimage-docker为此目的提供的唯一方法。其它方法需要通过[docker exec](#login_docker_exec)。由于`docker exec`同时带来了几个需要注意的问题，SSH同时也提供了一个可替换的方法。_

密码和challenge-response认证方式默认是禁用的。只有key认证通过之后才能够开启。 | -| cron | 为了保证cron任务能够工作，必须运行cron后台进程。 | -| [runit](http://smarden.org/runit/) | 替换Ubuntu的Upstart。用于服务监控和管理。比SysV init更容易使用，同时当这些服务崩溃之后，支持后台进程自动重启。比Upstart更易使用，更加的轻量级。 | -| `setuser` | 使用其它账户运行命令的工具。比`su`更容易使用，比使用`sudo`有那么一点优势，跟`chpst`不同，这个工具需要正确的设置`$HOME`。像`/sbin/setuser`这样。 | -Baseimage-docker非常的轻量级：仅仅占用6MB内存。 - - -### 等等,我认为Docker在一个容器中就运行一个进程吗? -绝对不是这样的. 在一个docker容器中,运行多个进程也是很好的. 事实上,没有什么技术原因限制你只运行一个进程,运行很多的进程,只会把容器中系统的基本功能搞的更乱,比如syslog. - -Baseimage-docker *鼓励* 通过runit来运行多进程. - - -## 检测一下baseimage-docker - -要检测镜像,执行下面的命令: - - docker run --rm -t -i phusion/baseimage: /sbin/my_init -- bash -l - -`` 是[baseimage-docker的版本号](https://github.com/phusion/baseimage-docker/blob/master/Changelog.md). - -你不用手动去下载任何文件.上面的命令会自动从docker仓库下载baseimage-docker镜像. - - -## 使用baseimage-docker作为基础镜像 - - -### 入门指南 - -镜像名字叫`phusion/baseimage`,在Docker仓库上也是可用的. - -下面的这个是一个Dockerfile的模板. - - # 使用phusion/baseimage作为基础镜像,去构建你自己的镜像,需要下载一个明确的版本,千万不要使用`latest`. - # 查看https://github.com/phusion/baseimage-docker/blob/master/Changelog.md,可用看到版本的列表. - FROM phusion/baseimage: - - # 设置正确的环境变量. - ENV HOME /root - - # 生成SSH keys,baseimage-docker不包含任何的key,所以需要你自己生成.你也可以注释掉这句命令,系统在启动过程中,会生成一个. - RUN /etc/my_init.d/00_regen_ssh_host_keys.sh - - # 初始化baseimage-docker系统 - CMD ["/sbin/my_init"] - - # 这里可以放置你自己需要构建的命令 - - # 当完成后,清除APT. - RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - - - -### 增加后台进程 - -你可以通过runit工具向你的镜像中添加后台进程(例如:你自己的某些应用).你需要编写一个运行你需要的后台进程的脚步就可以了,runit工具会保证它的正常运行,如果进程死掉,runit也会重启它的. - -脚本的名称必须是`run`,必须是可以运行的,它需要放到`/etc/service/`. - -这里有一个例子,向你展示如果运行memcached服务的. - - ### memcached.sh(确定文件的权限是chmod +x): - #!/bin/sh - # `/sbin/setuser memcache` 指定一个`memcache`用户来运行命令.如果你忽略了这部分,就会使用root用户执行. - exec /sbin/setuser memcache /usr/bin/memcached >>/var/log/memcached.log 2>&1 - - ### 在Dockerfile中: - RUN mkdir /etc/service/memcached - ADD memcached.sh /etc/service/memcached/run - -注意脚本必须运行在后台的,**不能让他们进程进行daemonize/fork**.通常,后台进程会提供一个标志位或者配置文件. - - -### 在容器启动的时候,运行脚本. - -baseimage-docker的初始化脚本 `/sbin/my_init`,在启动的时候进程运行,按照下面的顺序: - - * 如果`/etc/my_init.d`存在,则按照字母顺序执行脚本. - * 如果`/etc/rc.local`存在,则执行里面的脚本. - -所有的脚本都是正确退出的,例如:退出的code是0.如果有任何脚本以非0的code退出,启动就会失败. - -下面的例子向你展示了怎么添加一个启动脚本.这个脚本很简单的记录的一个系统启动时间,将启动时间记录到/tmp/boottime.txt. - - ### 在 logtime.sh (文件权限chmod +x): - #!/bin/sh - date > /tmp/boottime.txt - - ### 在 Dockerfile中: - RUN mkdir -p /etc/my_init.d - ADD logtime.sh /etc/my_init.d/logtime.sh - - - -### 环境变量 - -如果你使用`/sbin/my_init`作为主容器命令,那么通过`docker run --env`或者在Dockerfile文件中设置的`ENV`环境变量,都会被`my_init`读取. - - * 在Unix系统中,环境变量都会被子进程给继承.这就意味着,子进程不可能修改环境变量或者修改其他进程的环境变量. - * 由于上面提到的一点,这里没有一个可以为所有应用和服务集中定义环境的地方.Debian提供了一个`/etc/environment` 文件,解决一些问题. - * 某些服务更改环境变量是为了给子进程使用.Nginx有这样的一个例子:它移除了所有的环境变量,除非你通过`env`进行了配置,明确了某些是保留的.如果你部署了任何应用在Nginx镜像(例如:使用[passenger-docker](https://github.com/phusion/passenger-docker)镜像或者使用Phusion Passenger作为你的镜像.),那么你通过Docker,你不会看到任何环境变量. - - -`my_init`提供了一个办法来解决这些问题. - - -#### 集中定义你的环境变量 - -在启动的时候,在执行[startup scripts](#running_startup_scripts),`my_init`会从`/etc/container_environment`导入环境变量.这个文件夹下面,包含的文件,文件被命名为环境变量的名字.文件内容就是环境变量的值.这个文件夹是因此是一个集中定义你的环境变量的好地方,它会继承到所有启动项目和Runit管理的服务中. - -给个例子,在你的dockerfile如何定义一个环境变量: - - RUN echo Apachai Hopachai > /etc/container_environment/MY_NAME - -你可以按照下面这样验证: - - $ docker run -t -i /sbin/my_init -- bash -l - ... - *** Running bash -l... - # echo $MY_NAME - Apachai Hopachai - -**换行处理** - -如果你观察仔细一点,你会注意到'echo'命令,实际上在它是在新行打印出来的.为什么$MY_NAME没有包含在一行呢? 因为`my_init`在尾部有个换行字符.如果你打算让你的值包含一个新行,你需要增*另外*一个新字符,像这样: - - RUN echo -e "Apachai Hopachai\n" > /etc/container_environment/MY_NAME - - -#### 环境变量存储 - -上面提到集中定义环境变量,它不会从子服务进程改变父服务进程或者重置环境变量.而且,`my_init`也会很容易的让你查询到原始的环境变量是什么. - -在启动的时候,`/etc/container_environment`, `my_init`中的变量会存储起来,并且导入到环境变量中,例如一下的格式: - - * `/etc/container_environment` - * `/etc/container_environment.sh`- 一个bash存储的环境变量格式.你可以从这个命令中得到base格式的文件. - * `/etc/container_environment.json` - 一个json格式存储的环境变量格式. - -多种格式可以让你不管采用什么语言/apps都可以很容易使用环境变量. - -这里有个例子,展示怎么使用: - - $ docker run -t -i \ - --env FOO=bar --env HELLO='my beautiful world' \ - phusion/baseimage: /sbin/my_init -- \ - bash -l - ... - *** Running bash -l... - # ls /etc/container_environment - FOO HELLO HOME HOSTNAME PATH TERM container - # cat /etc/container_environment/HELLO; echo - my beautiful world - # cat /etc/container_environment.json; echo - {"TERM": "xterm", "container": "lxc", "HOSTNAME": "f45449f06950", "HOME": "/root", "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "FOO": "bar", "HELLO": "my beautiful world"} - # source /etc/container_environment.sh - # echo $HELLO - my beautiful world - - -#### 修改环境变量 - -通过修改`/etc/container_environment`这个文件,很有可能修改了`my_init`中的环境变量.之后,每次`my_init`启动[启动脚本](#running_startup_scripts),就会重置掉我们自己`/etc/container_environment`中的环境变量,也就会导致`container_environment.sh`和`container_environment.json`重新存储. - -但是记住这些: - - * 修改`container_environment.sh` 和 `container_environment.json`是没有效果的. - * Runit 的服务是不能像这样修改环境变量的.`my_init`运行的时候,只对`/etc/container_environment`中的修改是生效的. - - -#### 安全 - -因为环境变量可能包含敏感信息, `/etc/container_environment`和它的bash文件和JSON文件,默认都是root,都是可以被`docker_env`群组可以访问的(所以任何用户只要添加到群组中,都可以自动的获取这些信息). - -如果你确定你的环境变量中没有什么敏感信息,那么你可以放松管理权限,将文件夹和文件分配下面的权限: - - RUN chmod 755 /etc/container_environment - RUN chmod 644 /etc/container_environment.sh /etc/container_environment.json - - -### 解决Docker没有办法解决的/etc/hosts的问题 - -当前是没有办法在docker容器中修改`/etc/hosts`,这个是因为[Docker bug 2267](https://github.com/dotcloud/docker/issues/2267).Baseimage-docker包含了解决这个问题的办法,你必须明白是怎么修改的. - -修改的办法包含在系统库中的` libnss_files.so.2`文件,这个文件使用`/etc/workaround-docker-2267/hosts`来代替系统使用`/etc/hosts`.如果需要修改`/etc/hosts`,你只要修改`/etc/workaround-docker-2267/hosts`就可以了. - -增加这个修改到你的Dockerfile.下面的命令修改了文件`libnss_files.so.2`. - - RUN /usr/bin/workaround-docker-2267 - -(其实你不用在Dockerfile文件中运行这个命令,你可以在容器中运行一个shell就可以了.) - -验证一下它是否生效了,[在你的容器中打开一个shell](#inspecting),修改`/etc/workaround-docker-2267/hosts`,检查一下是否生效了: - - bash# echo 127.0.0.1 my-test-domain.com >> /etc/workaround-docker-2267/hosts - bash# ping my-test-domain.com - ...should ping 127.0.0.1... - -**注意apt-get升级:** 如果Ubuntu升级,就有可能将`libnss_files.so.2`覆盖掉,那么修改就会失效.你必须重新运行`/usr/bin/workaround-docker-2267`.为了安全一点,你应该在运行`apt-get upgrade`之后,运行一下这个命令. - - -### 禁用SSH -Baseimage-docker默认是支持SSH的,所以可以[使用SSH](#login_ssh)来[管理你的容器](#container_administration).万一你不想支持SSH,你可以只要禁用它: - - RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh - - -## 容器管理 - -一个优秀的docker想法,就是docker是一个无状态的,容易启动的容器,就想一个黑盒子.然而,你可能遇到某种情况,需要登录到容器,或者运行命令在容器中.或者为了开发,需要查看或者debug的目的.这章就给你讲解怎么管理容器. - - - -### 在一个新容器中运行一个一闪而过的命令 - -_**备注:** 这章讲解怎么在一个-新-容器中运行命令.要在一个存在的容器中运行命令,请查看[在一个存在的容器中,运行一个命令](#run_inside_existing_container)._ - -正常情况下,当你创建了一个新容器,为了在容器中运行一个单独的命令,而且在运行之后会立即退出的,你会这样调用docker命令: - - docker run YOUR_IMAGE COMMAND ARGUMENTS... - -然而下面的方法初始化系统的进行是不会启动.它是这样的,当调用`COMMAND`的时候,重要的后台进程,例如定时任务和系统日志都是不运行的.同样,子进程也是不会出现的,因为`COMMAND`的pid是1. - -Baseimage-docker提供了一个灵活的方式运行只要一闪而过的命令,同时也解决了上述所说的问题.以一下的方式运行一条命令: - - docker run YOUR_IMAGE /sbin/my_init -- COMMAND ARGUMENTS ... - -他们会按照下面的流程执行: - - * 运行所有的启动文件,例如 /etc/my_init.d/* and /etc/rc.local. - * 运行所有的runit服务 - * 运行指定的命令 - * 运行指定的命令结束之后,结束所有runit服务. - -例如: - - $ docker run phusion/baseimage: /sbin/my_init -- ls - *** Running /etc/my_init.d/00_regen_ssh_host_keys.sh... - No SSH host key available. Generating one... - Creating SSH2 RSA key; this may take some time ... - Creating SSH2 DSA key; this may take some time ... - Creating SSH2 ECDSA key; this may take some time ... - *** Running /etc/rc.local... - *** Booting runit daemon... - *** Runit started as PID 80 - *** Running ls... - bin boot dev etc home image lib lib64 media mnt opt proc root run sbin selinux srv sys tmp usr var - *** ls exited with exit code 0. - *** Shutting down runit daemon (PID 80)... - *** Killing all processes... - -你会发现默认的启动的流程太负责.或者你不希望执行启动文件.你可以自定义所有通过给`my_init`增加参数.调用`docker run YOUR_IMAGE /sbin/my_init --help`可以看到帮助信息. - -例如上面运行`ls`命令,同时要求不运行启动脚本,减少信息打印,运行runit所有命令. - - $ docker run phusion/baseimage: /sbin/my_init --skip-startup-files --quiet -- ls - bin boot dev etc home image lib lib64 media mnt opt proc root run sbin selinux srv sys tmp usr var - - -### 在一个已经运行的容器中,运行一条命令 - -这里有两种办法去在一个已经运行的容器中运行命令. - - * 通过`nseneter`工具.这个工具用于Linux内核调用在内嵌容器中运行命令.可以查看[通过`nsenter`,登录容器或者在容器内执行命令](#login_nsenter). - * 通过SSH.这种办法需要在容器中运行ssh服务,而且需要你创建自己的sshkey.可以查看[通过`ssh`,登录容器或者在容器内执行命令](#login_ssh). - -两种方法都是他们各自的优点和确定,你可以学习他们各自的章节来了他们. - - -### 通过`nsenter`,登录容器或者在容器内执行命令 - -你可以使用在docker主机上面的`nsenter`工具,来登录任何基于baseimage-docker的docker容器.你可以使用它在你的容器中运行命令. - -这里有个和[通过`ssh`,登录容器或者在容器内执行命令](#login_ssh)的优缺点的比较: - - * 优点 - * 不需要在容器中运行ssh服务. - * 不需要ssh key. - * 运行在任何容器上,甚至不是基于baseimage-docker的容器. - * 缺点 - * 通过`nsenter`运行的进程会和正常运行稍微有不同.例如,他们不同结束掉在容器中正常运行的进程.这适用于所有的子进程. - * 如果`nsenter`进程被其他命令(如`kill`命令)给终止,然后由nsenter所执行的命令,是*不会*被结束的.你将不得不手动清理.(备注:终端控制命令像Ctrl-C *会* 清理所有的子进程,因为终端信号被发送到所有流程的终端会话) - * 需要学习新工具. - * 需要在docker主机上面提供root权限. - * 需要在docker主机上面是可用的.在写这篇文字的时候(2014年7月),大多数linux发行版没有加载它.然而,baseimage-docker提供了预编译的二进制文件,允许你通过[docker-bash](#docker_bash)工具,来很容易的使用它. - * 不可能没有登录到docker主机,就登录到docker容器中.(也就是说,你必须登录到docker主机,通过docker主机登录到容器.) - - -#### 用例 - -第一,确定`nsenter`已经安装了.在写这篇文字的时候(2014年7月),大多数linux发行版没有加载它.然而,baseimage-docker提供了预编译的二进制文件,允许你通过[docker-bash](#docker_bash)工具,让任何人都可以使用. - -接着,启动一个容器. - - docker run YOUR_IMAGE - -找出你刚才运行容器的`ID`. - - docker ps - -一旦拥有容器的id,找到运行容器的主要进程额`PID`. - - docker inspect -f "{{ .State.Pid }}" - -现在你有的容器的主进程的PID,就可以使用`nsenter`来登录容器,或者在容器里面执行命令: - - # 登录容器 - nsenter --target
--mount --uts --ipc --net --pid bash -l - - # 在容器中执行命令 - nsenter --target
--mount --uts --ipc --net --pid -- echo hello world - - -#### `docker-bash`工具 - -查找一个容器的主要进程的PID和输入这么长的nsenter命令很快会变得乏味无论.幸运的是,我们提供了一个`docker-bash` 工具,它可以自动完成只要的工具.这个工具是运行在*docker主机*上面,不是在docker容器中. - -该工具还附带了一个预编译的二进制`nsenter`,这样你不需要自己安装`nsenter`了.`docker-bash`是很简单的使用的. - -首先,在docker主机上安装这个工具: - - curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \ - tar xzf master.tar.gz && \ - sudo ./baseimage-docker-master/install-tools.sh - -运行这个工具登录到容器中: - - docker-bash YOUR-CONTAINER-ID - -你可以通过`docker ps`来查找你的容器ID. - -默认,`docker-bash`会打开一个bash 回话.你可以告诉运行什么命令,之后就会自动退出: - - docker-bash YOUR-CONTAINER-ID echo hello world - - -### 通过`ssh`,登录容器或者在容器内执行命令 - -你可以使用ssh来登录任何基于baseimage-docker的容器.你可以使用它在容器中执行命令. - -这里有个和[通过`nsenter`,登录容器或者在容器内执行命令](#login_nsenter)的优缺点的比较: - - * 优点 - * 不像`nsenter`一样,运行在docker主机上面.几乎每个人都会安装一个ssh客户端. - * 不想使用`nsenter`,运行的进程和正在的进程会不一样. - * 不需要docker主机提供root权限. - * 运行你让用户登录到容器,而不需要登录到docker主机.然而,默认这是不启用的,因为baseimage-docker默认不是开放ssh服务的. - *　缺点 - * 需要设置ssh key.然而,baseimage-docker会提供一中办法,会让key的生成会很容器.阅读更多信息. - -第一件事情,就是你需要确定你在容器中已经安装设置了ssh key. 默认,没有任何安装key的,所有你无法登录.为了方便的原因,我们提供了一个[已经生成的key](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key) [(PuTTY format)](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key.ppk),为了让你使用方便.然后,请注意这个key仅仅是为方便.他没有任何安全行,因为它的key是在网络上提供的.**在生产环境,你必须使用你自己的key.** - - - -#### 在容器中使用key - -你可以临时的使用key仅仅作为容器使用.这就以为这key是安装在容器上的.如果你使用`docker stop`和`docker start`控制容器,那么key是在容器中,但是如果你使用`docker run`开启一个新容器,那么这个容器是不包含key的. - -启动新容器包含key`--enable-insecure-key`: - - docker run YOUR_IMAGE /sbin/my_init --enable-insecure-key - -找出你的刚才运行的容器的ID: - - docker ps - -一旦你拥有容器的ID,就能找到容器使用的IP地址: - - docker inspect -f "{{ .NetworkSettings.IPAddress }}" - -现在你有得了IP地址,你就看通过SSH来登录容器,或者在容器中执行命令了: - - # 下载key - curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/services/sshd/keys/insecure_key - chmod 600 insecure_key - - # 登录容器 - ssh -i insecure_key root@ - - # 在容器中执行命令 - ssh -i insecure_key root@ echo hello world - - -#### 支持一个长久的key - -在一个长久存在的镜像中支持一个key是很可能的.一般是不推荐这么做,但是对于临时开始或者做demo演示,对安全要求不高,还是很合适的. - -编辑你的dockerfile,来安装永久的key: - - RUN /usr/sbin/enable_insecure_key - -在容器中怎么使用,同[在容器中使用key](#using_the_insecure_key_for_one_container_only)的章节说的一样. - - -#### 使用你自己的key - -编辑你的dockerfile,来安装ssh public key: - - ## 安装你自己的public key. - ADD your_key.pub /tmp/your_key.pub - RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub - -重新创建你的镜像.一旦你创建成功,启动基于这个镜像的容器. - - docker run your-image-name - -找出你的刚才运行的容器的ID: - - docker ps - -一旦你拥有容器的ID,就能找到容器使用的IP地址: - - docker inspect -f "{{ .NetworkSettings.IPAddress }}" - -现在你有得了IP地址,你就看通过SSH来登录容器,或者在容器中执行命令了: - - # 登录容器 - ssh -i /path-to/your_key root@ - - # 在容器中执行命令 - ssh -i /path-to/your_key root@ echo hello world - - -#### `docker-ssh`工具 - -找到容器的IP,运行ssh命令,很快会变得乏味无聊.幸运的是,我们提供了一个`docker-ssh`,可以自动完成这些事情.这个工具是运行在*Docker 主机*上的,不是安装在docker容器中的. - -首先,在docker主机上面安装这个工具. - - curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \ - tar xzf master.tar.gz && \ - sudo ./baseimage-docker-master/install-tools.sh - -使用这个工具通过ssh登录容器: - - docker-ssh YOUR-CONTAINER-ID - -你可以使用`docker ps`找到`YOUR-CONTAINER-ID`. - -默认,`docker-bash`会打开一个bash 回话.你可以告诉运行什么命令,之后就会自动退出: - - docker-ssh YOUR-CONTAINER-ID echo hello world - - -## 创建你自己的镜像 - -如果某些原因,你需要创建你自己的镜像,来替代从docker仓库下载镜像,可以按照的说明. - -克隆仓库: - - git clone https://github.com/phusion/baseimage-docker.git - cd baseimage-docker - -创建一个包含docker在的虚拟机.你可以使用我们提供的Vagrantfile. - - vagrant up - vagrant ssh - cd /vagrant - -编译镜像: - - make build - -如果你想把创建的镜像名字,叫其他名字,通过`NAME`变量可以设置: - - make build NAME=joe/baseimage - - -## 总结 - - * Using baseimage-docker? [Tweet about us](https://twitter.com/share) or [follow us on Twitter](https://twitter.com/phusion_nl). - * Having problems? Want to participate in development? Please post a message at [the discussion forum](https://groups.google.com/d/forum/passenger-docker). - * Looking for a more complete base image, one that is ideal for Ruby, Python, Node.js and Meteor web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker). - -[](http://www.phusion.nl/) - -Please enjoy baseimage-docker, a product by [Phusion](http://www.phusion.nl/). :-) diff --git a/README_zh_tw.md b/README_zh_tw.md deleted file mode 100644 index a2a2f7faa..000000000 --- a/README_zh_tw.md +++ /dev/null @@ -1,567 +0,0 @@ - -# Docker友好的，最小的Ubuntu基礎鏡像 - -Baseimage-docker是一個特殊的[Docker](http://www.docker.io)鏡像，在Docker容器內做了配置，並且可以正確使用。它確實是一個Ubuntu系統, 除此之外進行了如下修訂： - - * 爲更加友好的支持Docker，做了修訂。 - * 在Docker環境下，作爲管理工具特別有用。 - * 在[不違反Docker哲學](#docker_single_process)的前提下，能夠很容易的運行多行程的機制。 - -可以把它作爲自己的基礎Docker鏡像。 - -Baseimage-docker項目可以直接從Docker的[registry](https://index.docker.io/u/phusion/baseimage/)獲取！ - - -### 原生的Ubuntu基礎鏡像有什麼問題呢？ - -原生Ubuntu不是爲了在Docker內運行而設計的。它的初始化系統Upstart，假定運行的環境要麼是真實的硬體，要麼是虛擬的硬體，而不是在Docker容器內。但是在一個Docker的容器內，並不需要一個完整的系統，你需要的只是一個很小的系統。但是如果你不是非常熟悉Unix的系統模型，想要在Docker容器內裁減出最小的系統，會碰到很多難以正確解決的陌生的技術坑。這些坑會引起很多莫名其妙的問題。 - -Baseimage-docker讓這一切完美。在"內容"部分描述了所有這些修改。 - - -### 爲什麼使用baseimage-docker？ - -你自己可以從Dockerfile配置一個原生`ubuntu`鏡像，爲什麼還要多此一舉的使用baseimage-docker呢? - - * 配置一個Docker友好的基礎系統並不是一個簡單的任務。如前所述，過程中會碰到很多坑。當你搞定這些坑之後，只不過是又重新發明了一個baseimage-docker而已。使用baseimage-docker可以免去你這方面需要做的努力。 - * 減少需要正確編寫Dockerfile文件的時間。你不用再擔心基礎系統，可以專注於你自己的技術棧和你的項目。 - * 減少需要運行`docker build`的時間，讓你更快的迭代Dockerfile。 - * 減少了重新部署的時的下載時間。Docker只需要在第一次部署的時候下載一次基礎鏡像。在隨後的部署中,只需要改變你下載之後對基礎鏡像進行修改的部分。 - ------------------------------------------ - -**相關資源** - - [網站](http://phusion.github.io/baseimage-docker/) | - [Github](https://github.com/phusion/baseimage-docker) | - [Docker registry](https://index.docker.io/u/phusion/baseimage/) | - [論壇](https://groups.google.com/d/forum/passenger-docker) | - [Twitter](https://twitter.com/phusion_nl) | - [Blog](http://blog.phusion.nl/) - -**目錄** - - * [鏡像裏面有什麼?](#whats_inside) - * [概述](#whats_inside_overview) - * [等等,我認爲Docker在一個容器中只能允許運行一個行程?](#docker_single_process) - * [Baseimage-docker更側重於“胖容器”還是“把容器當作虛擬機”？](#fat_containers) - * [查看baseimage-docker](#inspecting) - * [使用baseimage-docker作爲基礎鏡像](#using) - * [開始](#getting_started) - * [增加額外的後臺行程](#adding_additional_daemons) - * [容器啓動時運行腳本](#running_startup_scripts) - * [環境變數](#environment_variables) - * [集中定義自己的環境變數](#envvar_central_definition) - * [保存環境變數](#envvar_dumps) - * [修改環境變數](#modifying_envvars) - * [安全性](#envvar_security) - * [容器管理](#container_administration) - * [在一個新容器中運行單條命令](#oneshot) - * [在正在運行的的容器中運行一條命令](#run_inside_existing_container) - * [通過`docer exec`登錄容器](#login_docker_exec) - * [用法](#nsenter_usage) - * [使用SSH登錄容器](#login_ssh) - * [啓用SSH](#enabling_ssh) - * [關於SSH的key](#ssh_keys) - * [只對一個容器使用不安全key](#using_insecure_key_for_one_container_only) - * [永久開啓不安全key](#enabling_the_insecure_key_permanently) - * [使用你自己的key](#using_your_own_key) - * [`docker-ssh`工具](#docker_ssh) - * [構建自己的鏡像](#building) - * [總結](#conclusion) - ------------------------------------------ - - -## 鏡像裏面有什麼？ - - -### 概述 - -*想看一個裏面包含Ruby，Python，Node.js以及Meteor的完整基礎鏡像？可以看一下[passenger-docker](https://github.com/phusion/passenger-docker)。* - -| 模塊 | 爲什麼包含這些？以及備註 | -| ---------------- | ------------------- | -| Ubuntu 16.04 LTS | 基礎系統。 | -| 一個**正確**的初始化行程 | *主要文章：[Docker和PID 1 殭屍行程回收問題](http://blog.phusion.nl/2015/01/20/docker-and-the-pid-1-zombie-reaping-problem/)*

根據Unix行程模型，[初始化行程](https://en.wikipedia.org/wiki/Init) -- PID 1 -- 繼承了所有[孤立的子行程](https://en.wikipedia.org/wiki/Orphan_process)，並且必須[進行回收](https://en.wikipedia.org/wiki/Wait_(system_call))。大多數Docker容器沒有一個初始化行程可以正確的完成此操作，隨着時間的推移會導致他們的容器出現了大量的[殭屍行程](https://en.wikipedia.org/wiki/Zombie_process)。

而且，`docker stop`發送SIGTERM信號給初始化行程，照理說此信號應該可以停止所有服務。不幸的是由於它們對硬體進行了關閉操作，導致Docker內的大多數初始化系統沒有正確執行。這會導致行程強行被SIGKILL信號關閉，從而喪失了一個正確取消初始化設置的機會。這會導致文件損壞。

Baseimage-docker配有一個名爲`/sbin/my_init`的初始化行程來同時正確的完成這些任務。 | -| 修復了APT與Docker不兼容的問題 | 詳情參見：https://github.com/dotcloud/docker/issues/1024 。 | -| syslog-ng | 對於很多服務－包括kernel自身，都需要一個syslog後臺行程，以便可以正確的將log輸出到/var/log/syslog中。如果沒有運行syslog後臺行程，很多重要的信息就會默默的丟失了。

只對本地進行監聽。所有syslog信息會被轉發給“docker logs”。 | -| logrotate | 定期轉存和壓縮日誌。 | -| SSH服務 | 允許你很容易的登錄到容器中進行[查詢或管理](#login_ssh)操作。

_SSH**默認是禁用**的，這也是baseimage-docker爲此目的提供的唯一方法。其它方法需要通過[docker exec](#login_docker_exec)。由於`docker exec`同時帶來了幾個需要注意的問題，SSH同時也提供了一個可替換的方法。_

密碼和challenge-response認證方式默認是禁用的。只有key認證通過之後才能夠開啓。 | -| cron | 爲了保證cron任務能夠工作，必須運行cron後臺行程。 | -| [runit](http://smarden.org/runit/) | 替換Ubuntu的Upstart。用於服務監控和管理。比SysV init更容易使用，同時當這些服務崩潰之後，支持後臺行程自動重啓。比Upstart更易使用，更加的輕量級。 | -| `setuser` | 使用其它賬戶運行命令的工具。比`su`更容易使用，比使用`sudo`有那麼一點優勢，跟`chpst`不同，這個工具需要正確的設置`$HOME`。像`/sbin/setuser`這樣。 | -Baseimage-docker非常的輕量級：僅僅佔用6MB內存。 - - -### 等等,我認爲Docker在一個容器中就運行一個行程嗎? -絕對不是這樣的. 在一個docker容器中,運行多個行程也是很好的. 事實上,沒有什麼技術原因限制你只運行一個行程,運行很多的行程,只會把容器中系統的基本功能搞的更亂,比如syslog. - -Baseimage-docker *鼓勵* 通過runit來運行多行程. - - -## 檢測一下baseimage-docker - -要檢測鏡像,執行下面的命令: - - docker run --rm -t -i phusion/baseimage: /sbin/my_init -- bash -l - -`` 是[baseimage-docker的版本號](https://github.com/phusion/baseimage-docker/blob/master/Changelog.md). - -你不用手動去下載任何文件.上面的命令會自動從docker倉庫下載baseimage-docker鏡像. - - -## 使用baseimage-docker作爲基礎鏡像 - - -### 入門指南 - -The image is called `phusion/baseimage`, and is available on the Docker registry. -鏡像名字叫`phusion/baseimage`,在Docker倉庫上也是可用的. - -下面的這個是一個Dockerfile的模板. - - # 使用phusion/baseimage作爲基礎鏡像,去構建你自己的鏡像,需要下載一個明確的版本,千萬不要使用`latest`. - # 查看https://github.com/phusion/baseimage-docker/blob/master/Changelog.md,可用看到版本的列表. - FROM phusion/baseimage: - - # 設置正確的環境變數. - ENV HOME /root - - # 生成SSH keys,baseimage-docker不包含任何的key,所以需要你自己生成.你也可以註釋掉這句命令,系統在啓動過程中,會生成一個. - RUN /etc/my_init.d/00_regen_ssh_host_keys.sh - - # 初始化baseimage-docker系統 - CMD ["/sbin/my_init"] - - # 這裏可以放置你自己需要構建的命令 - - # 當完成後,清除APT. - RUN apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* - - - -### 增加後臺行程 - -你可以通過runit工具向你的鏡像中添加後臺行程(例如:你自己的某些應用).你需要編寫一個運行你需要的後臺行程的腳步就可以了,runit工具會保證它的正常運行,如果行程死掉,runit也會重啓它的. - -腳本的名稱必須是`run`,必須是可以運行的,它需要放到`/etc/service/`. - -這裏有一個例子,向你展示如果運行memcached服務的. - - ### memcached.sh(確定文件的權限是chmod +x): - #!/bin/sh - # `/sbin/setuser memcache` 指定一個`memcache`用戶來運行命令.如果你忽略了這部分,就會使用root用戶執行. - exec /sbin/setuser memcache /usr/bin/memcached >>/var/log/memcached.log 2>&1 - - ### 在Dockerfile中: - RUN mkdir /etc/service/memcached - ADD memcached.sh /etc/service/memcached/run - -注意腳本必須運行在後臺的,**不能讓他們行程進行daemonize/fork**.通常,後臺行程會提供一個標誌位或者配置文件. - - -### 在容器啓動的時候,運行腳本. - -baseimage-docker的初始化腳本 `/sbin/my_init`,在啓動的時候行程運行,按照下面的順序: - - * 如果`/etc/my_init.d`存在,則按照字母順序執行腳本. - * 如果`/etc/rc.local`存在,則執行裏面的腳本. - -所有的腳本都是正確退出的,例如:退出的code是0.如果有任何腳本以非0的code退出,啓動就會失敗. - -下面的例子向你展示了怎麼添加一個啓動腳本.這個腳本很簡單的記錄的一個系統啓動時間,將啓動時間記錄到/tmp/boottime.txt. - - ### 在 logtime.sh (文件權限chmod +x): - #!/bin/sh - date > /tmp/boottime.txt - - ### 在 Dockerfile中: - RUN mkdir -p /etc/my_init.d - ADD logtime.sh /etc/my_init.d/logtime.sh - - - -### 環境變數 - -如果你使用`/sbin/my_init`作爲主容器命令,那麼通過`docker run --env`或者在Dockerfile文件中設置的`ENV`環境變數,都會被`my_init`讀取. - - * 在Unix系統中,環境變數都會被子行程給繼承.這就意味着,子行程不可能修改環境變數或者修改其他行程的環境變數. - * 由於上面提到的一點,這裏沒有一個可以爲所有應用和服務集中定義環境的地方.Debian提供了一個`/etc/environment` 文件,解決一些問題. - * 某些服務更改環境變數是爲了給子行程使用.Nginx有這樣的一個例子:它移除了所有的環境變數,除非你通過`env`進行了配置,明確了某些是保留的.如果你部署了任何應用在Nginx鏡像(例如:使用[passenger-docker](https://github.com/phusion/passenger-docker)鏡像或者使用Phusion Passenger作爲你的鏡像.),那麼你通過Docker,你不會看到任何環境變數. - - -`my_init`提供了一個辦法來解決這些問題. - - -#### 集中定義你的環境變數 - -在啓動的時候,在執行[startup scripts](#running_startup_scripts),`my_init`會從`/etc/container_environment`導入環境變數.這個文件夾下面,包含的文件,文件被命名爲環境變數的名字.文件內容就是環境變數的值.這個文件夾是因此是一個集中定義你的環境變數的好地方,它會繼承到所有啓動項目和Runit管理的服務中. - -給個例子,在你的dockerfile如何定義一個環境變數: - - RUN echo Apachai Hopachai > /etc/container_environment/MY_NAME - -你可以按照下面這樣驗證: - - $ docker run -t -i /sbin/my_init -- bash -l - ... - *** Running bash -l... - # echo $MY_NAME - Apachai Hopachai - -**換行處理** - -如果你觀察仔細一點,你會注意到'echo'命令,實際上在它是在新行打印出來的.爲什麼$MY_NAME沒有包含在一行呢? 因爲`my_init`在尾部有個換行字符.如果你打算讓你的值包含一個新行,你需要增*另外*一個新字符,像這樣: - - RUN echo -e "Apachai Hopachai\n" > /etc/container_environment/MY_NAME - - -#### 環境變數存儲 - -上面提到集中定義環境變數,它不會從子服務行程改變父服務行程或者重置環境變數.而且,`my_init`也會很容易的讓你查詢到原始的環境變數是什麼. - -在啓動的時候,`/etc/container_environment`, `my_init`中的變數會存儲起來,並且導入到環境變數中,例如一下的格式: - - * `/etc/container_environment` - * `/etc/container_environment.sh`- 一個bash存儲的環境變數格式.你可以從這個命令中得到base格式的文件. - * `/etc/container_environment.json` - 一個json格式存儲的環境變數格式. - -多種格式可以讓你不管採用什麼語言/apps都可以很容易使用環境變數. - -這裏有個例子,展示怎麼使用: - - $ docker run -t -i \ - --env FOO=bar --env HELLO='my beautiful world' \ - phusion/baseimage: /sbin/my_init -- \ - bash -l - ... - *** Running bash -l... - # ls /etc/container_environment - FOO HELLO HOME HOSTNAME PATH TERM container - # cat /etc/container_environment/HELLO; echo - my beautiful world - # cat /etc/container_environment.json; echo - {"TERM": "xterm", "container": "lxc", "HOSTNAME": "f45449f06950", "HOME": "/root", "PATH": "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", "FOO": "bar", "HELLO": "my beautiful world"} - # source /etc/container_environment.sh - # echo $HELLO - my beautiful world - - -#### 修改環境變數 - -通過修改`/etc/container_environment`這個文件,很有可能修改了`my_init`中的環境變數.之後,每次`my_init`啓動[啓動腳本](#running_startup_scripts),就會重置掉我們自己`/etc/container_environment`中的環境變數,也就會導致`container_environment.sh`和`container_environment.json`重新存儲. - -但是記住這些: - - * 修改`container_environment.sh` 和 `container_environment.json`是沒有效果的. - * Runit 的服務是不能像這樣修改環境變數的.`my_init`運行的時候,只對`/etc/container_environment`中的修改是生效的. - - -#### 安全 - -因爲環境變數可能包含敏感信息, `/etc/container_environment`和它的bash文件和JSON文件,默認都是root,都是可以被`docker_env`羣組可以訪問的(所以任何用戶只要添加到羣組中,都可以自動的獲取這些信息). - -如果你確定你的環境變數中沒有什麼敏感信息,那麼你可以放鬆管理權限,將文件夾和文件分配下面的權限: - - RUN chmod 755 /etc/container_environment - RUN chmod 644 /etc/container_environment.sh /etc/container_environment.json - - -### 解決Docker沒有辦法解決的/etc/hosts的問題 - -當前是沒有辦法在docker容器中修改`/etc/hosts`,這個是因爲[Docker bug 2267](https://github.com/dotcloud/docker/issues/2267).Baseimage-docker包含了解決這個問題的辦法,你必須明白是怎麼修改的. - -修改的辦法包含在系統庫中的` libnss_files.so.2`文件,這個文件使用`/etc/workaround-docker-2267/hosts`來代替系統使用`/etc/hosts`.如果需要修改`/etc/hosts`,你只要修改`/etc/workaround-docker-2267/hosts`就可以了. - -增加這個修改到你的Dockerfile.下面的命令修改了文件`libnss_files.so.2`. - - RUN /usr/bin/workaround-docker-2267 - -(其實你不用在Dockerfile文件中運行這個命令,你可以在容器中運行一個shell就可以了.) - -驗證一下它是否生效了,[在你的容器中打開一個shell](#inspecting),修改`/etc/workaround-docker-2267/hosts`,檢查一下是否生效了: - - bash# echo 127.0.0.1 my-test-domain.com >> /etc/workaround-docker-2267/hosts - bash# ping my-test-domain.com - ...should ping 127.0.0.1... - -**注意apt-get升級:** 如果Ubuntu升級,就有可能將`libnss_files.so.2`覆蓋掉,那麼修改就會失效.你必須重新運行`/usr/bin/workaround-docker-2267`.爲了安全一點,你應該在運行`apt-get upgrade`之後,運行一下這個命令. - - -### 禁用SSH -Baseimage-docker默認是支持SSH的,所以可以[使用SSH](#login_ssh)來[管理你的容器](#container_administration).萬一你不想支持SSH,你可以只要禁用它: - - RUN rm -rf /etc/service/sshd /etc/my_init.d/00_regen_ssh_host_keys.sh - - -## 容器管理 - -一個優秀的docker想法,就是docker是一個無狀態的,容易啓動的容器,就想一個黑盒子.然而,你可能遇到某種情況,需要登錄到容器,或者運行命令在容器中.或者爲了開發,需要查看或者debug的目的.這章就給你講解怎麼管理容器. - - - -### 在一個新容器中運行一個一閃而過的命令 - -_**備註:** 這章講解怎麼在一個-新-容器中運行命令.要在一個存在的容器中運行命令,請查看[在一個存在的容器中,運行一個命令](#run_inside_existing_container)._ - -正常情況下,當你創建了一個新容器,爲了在容器中運行一個單獨的命令,而且在運行之後會立即退出的,你會這樣調用docker命令: - - docker run YOUR_IMAGE COMMAND ARGUMENTS... - -然而下面的方法初始化系統的進行是不會啓動.它是這樣的,當調用`COMMAND`的時候,重要的後臺行程,例如定時任務和系統日誌都是不運行的.同樣,子行程也是不會出現的,因爲`COMMAND`的pid是1. - -Baseimage-docker提供了一個靈活的方式運行只要一閃而過的命令,同時也解決了上述所說的問題.以一下的方式運行一條命令: - - docker run YOUR_IMAGE /sbin/my_init -- COMMAND ARGUMENTS ... - -他們會按照下面的流程執行: - - * 運行所有的啓動文件,例如 /etc/my_init.d/* and /etc/rc.local. - * 運行所有的runit服務 - * 運行指定的命令 - * 運行指定的命令結束之後,結束所有runit服務. - -例如: - - $ docker run phusion/baseimage: /sbin/my_init -- ls - *** Running /etc/my_init.d/00_regen_ssh_host_keys.sh... - No SSH host key available. Generating one... - Creating SSH2 RSA key; this may take some time ... - Creating SSH2 DSA key; this may take some time ... - Creating SSH2 ECDSA key; this may take some time ... - *** Running /etc/rc.local... - *** Booting runit daemon... - *** Runit started as PID 80 - *** Running ls... - bin boot dev etc home image lib lib64 media mnt opt proc root run sbin selinux srv sys tmp usr var - *** ls exited with exit code 0. - *** Shutting down runit daemon (PID 80)... - *** Killing all processes... - -你會發現默認的啓動的流程太負責.或者你不希望執行啓動文件.你可以自定義所有通過給`my_init`增加參數.調用`docker run YOUR_IMAGE /sbin/my_init --help`可以看到幫助信息. - -例如上面運行`ls`命令,同時要求不運行啓動腳本,減少信息打印,運行runit所有命令. - - $ docker run phusion/baseimage: /sbin/my_init --skip-startup-files --quiet -- ls - bin boot dev etc home image lib lib64 media mnt opt proc root run sbin selinux srv sys tmp usr var - - -### 在一個已經運行的容器中,運行一條命令 - -這裏有兩種辦法去在一個已經運行的容器中運行命令. - - * 通過`nseneter`工具.這個工具用於Linux內核調用在內嵌容器中運行命令.可以查看[通過`nsenter`,登錄容器或者在容器內執行命令](#login_nsenter). - * 通過SSH.這種辦法需要在容器中運行ssh服務,而且需要你創建自己的sshkey.可以查看[通過`ssh`,登錄容器或者在容器內執行命令](#login_ssh). - -兩種方法都是他們各自的優點和確定,你可以學習他們各自的章節來了他們. - - -### 通過`nsenter`,登錄容器或者在容器內執行命令 - -你可以使用在docker主機上面的`nsenter`工具,來登錄任何基於baseimage-docker的docker容器.你可以使用它在你的容器中運行命令. - -這裏有個和[通過`ssh`,登錄容器或者在容器內執行命令](#login_ssh)的優缺點的比較: - - * 優點 - * 不需要在容器中運行ssh服務. - * 不需要ssh key. - * 運行在任何容器上,甚至不是基於baseimage-docker的容器. - * 缺點 - * 通過`nsenter`運行的行程會和正常運行稍微有不同.例如,他們不同結束掉在容器中正常運行的行程.這適用於所有的子行程. - * 如果`nsenter`行程被其他命令(如`kill`命令)給終止,然後由nsenter所執行的命令,是*不會*被結束的.你將不得不手動清理.(備註:終端控制命令像Ctrl-C *會* 清理所有的子行程,因爲終端信號被髮送到所有流程的終端會話) - * 需要學習新工具. - * 需要在docker主機上面提供root權限. - * 需要在docker主機上面是可用的.在寫這篇文字的時候(2014年7月),大多數linux發行版沒有加載它.然而,baseimage-docker提供了預編譯的二進制文件,允許你通過[docker-bash](#docker_bash)工具,來很容易的使用它. - * 不可能沒有登錄到docker主機,就登錄到docker容器中.(也就是說,你必須登錄到docker主機,通過docker主機登錄到容器.) - - -#### 用例 - -第一,確定`nsenter`已經安裝了.在寫這篇文字的時候(2014年7月),大多數linux發行版沒有加載它.然而,baseimage-docker提供了預編譯的二進制文件,允許你通過[docker-bash](#docker_bash)工具,讓任何人都可以使用. - -接着,啓動一個容器. - - docker run YOUR_IMAGE - -找出你剛纔運行容器的`ID`. - - docker ps - -一旦擁有容器的id,找到運行容器的主要行程額`PID`. - - docker inspect -f "{{ .State.Pid }}" - -現在你有的容器的主行程的PID,就可以使用`nsenter`來登錄容器,或者在容器裏面執行命令: - - # 登錄容器 - nsenter --target
--mount --uts --ipc --net --pid bash -l - - # 在容器中執行命令 - nsenter --target
--mount --uts --ipc --net --pid -- echo hello world - - -#### `docker-bash`工具 - -查找一個容器的主要行程的PID和輸入這麼長的nsenter命令很快會變得乏味無論.幸運的是,我們提供了一個`docker-bash` 工具,它可以自動完成只要的工具.這個工具是運行在*docker主機*上面,不是在docker容器中. - -該工具還附帶了一個預編譯的二進制`nsenter`,這樣你不需要自己安裝`nsenter`了.`docker-bash`是很簡單的使用的. - -首先,在docker主機上安裝這個工具: - - curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \ - tar xzf master.tar.gz && \ - sudo ./baseimage-docker-master/install-tools.sh - -運行這個工具登錄到容器中: - - docker-bash YOUR-CONTAINER-ID - -你可以通過`docker ps`來查找你的容器ID. - -默認,`docker-bash`會打開一個bash 回話.你可以告訴運行什麼命令,之後就會自動退出: - - docker-bash YOUR-CONTAINER-ID echo hello world - - -### 通過`ssh`,登錄容器或者在容器內執行命令 - -你可以使用ssh來登錄任何基於baseimage-docker的容器.你可以使用它在容器中執行命令. - -這裏有個和[通過`nsenter`,登錄容器或者在容器內執行命令](#login_nsenter)的優缺點的比較: - - * 優點 - * 不像`nsenter`一樣,運行在docker主機上面.幾乎每個人都會安裝一個ssh客戶端. - * 不想使用`nsenter`,運行的行程和正在的行程會不一樣. - * 不需要docker主機提供root權限. - * 運行你讓用戶登錄到容器,而不需要登錄到docker主機.然而,默認這是不啓用的,因爲baseimage-docker默認不是開放ssh服務的. - *　缺點 - * 需要設置ssh key.然而,baseimage-docker會提供一中辦法,會讓key的生成會很容器.閱讀更多信息. - -第一件事情,就是你需要確定你在容器中已經安裝設置了ssh key. 默認,沒有任何安裝key的,所有你無法登錄.爲了方便的原因,我們提供了一個[已經生成的key](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key) [(PuTTY format)](https://github.com/phusion/baseimage-docker/blob/master/image/services/sshd/keys/insecure_key.ppk),爲了讓你使用方便.然後,請注意這個key僅僅是爲方便.他沒有任何安全行,因爲它的key是在網絡上提供的.**在生產環境,你必須使用你自己的key.** - - - -#### 在容器中使用key - -你可以臨時的使用key僅僅作爲容器使用.這就以爲這key是安裝在容器上的.如果你使用`docker stop`和`docker start`控制容器,那麼key是在容器中,但是如果你使用`docker run`開啓一個新容器,那麼這個容器是不包含key的. - -啓動新容器包含key`--enable-insecure-key`: - - docker run YOUR_IMAGE /sbin/my_init --enable-insecure-key - -找出你的剛纔運行的容器的ID: - - docker ps - -一旦你擁有容器的ID,就能找到容器使用的IP地址: - - docker inspect -f "{{ .NetworkSettings.IPAddress }}" - -現在你有得了IP地址,你就看通過SSH來登錄容器,或者在容器中執行命令了: - - # 下載key - curl -o insecure_key -fSL https://github.com/phusion/baseimage-docker/raw/master/image/services/sshd/keys/insecure_key - chmod 600 insecure_key - - # 登錄容器 - ssh -i insecure_key root@ - - # 在容器中執行命令 - ssh -i insecure_key root@ echo hello world - - -#### 支持一個長久的key - -在一個長久存在的鏡像中支持一個key是很可能的.一般是不推薦這麼做,但是對於臨時開始或者做demo演示,對安全要求不高,還是很合適的. - -編輯你的dockerfile,來安裝永久的key: - - RUN /usr/sbin/enable_insecure_key - -在容器中怎麼使用,同[在容器中使用key](#using_the_insecure_key_for_one_container_only)的章節說的一樣. - - -#### 使用你自己的key - -編輯你的dockerfile,來安裝ssh public key: - - ## 安裝你自己的public key. - ADD your_key.pub /tmp/your_key.pub - RUN cat /tmp/your_key.pub >> /root/.ssh/authorized_keys && rm -f /tmp/your_key.pub - -重新創建你的鏡像.一旦你創建成功,啓動基於這個鏡像的容器. - - docker run your-image-name - -找出你的剛纔運行的容器的ID: - - docker ps - -一旦你擁有容器的ID,就能找到容器使用的IP地址: - - docker inspect -f "{{ .NetworkSettings.IPAddress }}" - -現在你有得了IP地址,你就看通過SSH來登錄容器,或者在容器中執行命令了: - - # 登錄容器 - ssh -i /path-to/your_key root@ - - # 在容器中執行命令 - ssh -i /path-to/your_key root@ echo hello world - - -#### `docker-ssh`工具 - -找到容器的IP,運行ssh命令,很快會變得乏味無聊.幸運的是,我們提供了一個`docker-ssh`,可以自動完成這些事情.這個工具是運行在*Docker 主機*上的,不是安裝在docker容器中的. - -首先,在docker主機上面安裝這個工具. - - curl --fail -L -O https://github.com/phusion/baseimage-docker/archive/master.tar.gz && \ - tar xzf master.tar.gz && \ - sudo ./baseimage-docker-master/install-tools.sh - -使用這個工具通過ssh登錄容器: - - docker-ssh YOUR-CONTAINER-ID - -你可以使用`docker ps`找到`YOUR-CONTAINER-ID`. - -默認,`docker-bash`會打開一個bash 回話.你可以告訴運行什麼命令,之後就會自動退出: - - docker-ssh YOUR-CONTAINER-ID echo hello world - - -## 創建你自己的鏡像 - -如果某些原因,你需要創建你自己的鏡像,來替代從docker倉庫下載鏡像,可以按照的說明. - -克隆倉庫: - - git clone https://github.com/phusion/baseimage-docker.git - cd baseimage-docker - -創建一個包含docker在的虛擬機.你可以使用我們提供的Vagrantfile. - - vagrant up - vagrant ssh - cd /vagrant - -編譯鏡像: - - make build - -如果你想把創建的鏡像名字,叫其他名字,通過`NAME`變數可以設置: - - make build NAME=joe/baseimage - - -## 總結 - - * Using baseimage-docker? [Tweet about us](https://twitter.com/share) or [follow us on Twitter](https://twitter.com/phusion_nl). - * Having problems? Want to participate in development? Please post a message at [the discussion forum](https://groups.google.com/d/forum/passenger-docker). - * Looking for a more complete base image, one that is ideal for Ruby, Python, Node.js and Meteor web apps? Take a look at [passenger-docker](https://github.com/phusion/passenger-docker). - -[](http://www.phusion.nl/) - -Please enjoy baseimage-docker, a product by [Phusion](http://www.phusion.nl/). :-) diff --git a/Vagrantfile b/Vagrantfile deleted file mode 100644 index a1eb8af87..000000000 --- a/Vagrantfile +++ /dev/null @@ -1,54 +0,0 @@ -# -*- mode: ruby -*- -# vi: set ft=ruby : -ROOT = File.dirname(File.absolute_path(__FILE__)) - -# Vagrantfile API/syntax version. Don't touch unless you know what you're doing! -VAGRANTFILE_API_VERSION = '2' - -# Default env properties which can be overridden -# Example overrides: -# echo "ENV['PASSENGER_DOCKER_PATH'] ||= '../../phusion/passenger-docker' " >> ~/.vagrant.d/Vagrantfile -# echo "ENV['BASE_BOX_URL'] ||= 'd\:/dev/vm/vagrant/boxes/phusion/'" >> ~/.vagrant.d/Vagrantfile -BASE_BOX_URL = ENV['BASE_BOX_URL'] || 'https://oss-binaries.phusionpassenger.com/vagrant/boxes/latest/' -VAGRANT_BOX_URL = ENV['VAGRANT_BOX_URL'] || BASE_BOX_URL + 'ubuntu-14.04-amd64-vbox.box' -VMWARE_BOX_URL = ENV['VMWARE_BOX_URL'] || BASE_BOX_URL + 'ubuntu-14.04-amd64-vmwarefusion.box' -BASEIMAGE_PATH = ENV['BASEIMAGE_PATH' ] || '.' -PASSENGER_DOCKER_PATH = ENV['PASSENGER_PATH' ] || '../passenger-docker' -DOCKERIZER_PATH = ENV['DOCKERIZER_PATH'] || '../dockerizer' - -$script = <