mirror of
https://github.com/phusion/baseimage-docker.git
synced 2026-11-20 09:21:17 +00:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
81490388e5 | ||
|
|
64df8f2d71 | ||
|
|
4fd2dee826 |
No files matched your search
+9
-4
@@ -50,7 +50,12 @@ $minimal_apt_get_install apt-utils
|
||||
$minimal_apt_get_install apt-transport-https ca-certificates
|
||||
|
||||
## Install add-apt-repository
|
||||
$minimal_apt_get_install software-properties-common
|
||||
if grep -E '^ID=' /etc/os-release | grep -q ubuntu; then
|
||||
$minimal_apt_get_install software-properties-common
|
||||
fi
|
||||
|
||||
## Install python3 for debian
|
||||
$minimal_apt_get_install python3
|
||||
|
||||
## Upgrade all packages.
|
||||
apt-get dist-upgrade -y --no-install-recommends -o Dpkg::Options::="--force-confold"
|
||||
@@ -95,11 +100,11 @@ if grep -E '^ID=' /etc/os-release | grep -q ubuntu; then
|
||||
fi
|
||||
|
||||
## Fix locale.
|
||||
case $(lsb_release -is) in
|
||||
Ubuntu)
|
||||
case $(grep '^ID=' /etc/os-release | cut -d= -f2) in
|
||||
ubuntu)
|
||||
$minimal_apt_get_install language-pack-en
|
||||
;;
|
||||
Debian)
|
||||
debian)
|
||||
$minimal_apt_get_install locales locales-all
|
||||
echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
|
||||
;;
|
||||
|
||||
@@ -7,8 +7,8 @@ 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
|
||||
mkdir -p /var/run/sshd
|
||||
mkdir -p /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
|
||||
|
||||
@@ -22,10 +22,16 @@ ln -s /etc/container_environment.sh /etc/profile.d/
|
||||
$minimal_apt_get_install runit
|
||||
|
||||
## Install a syslog daemon and logrotate.
|
||||
[ "$DISABLE_SYSLOG" -eq 0 ] && /bd_build/services/syslog-ng/syslog-ng.sh || true
|
||||
if [ "$DISABLE_SYSLOG" -eq 0 ]; then
|
||||
/bd_build/services/syslog-ng/syslog-ng.sh
|
||||
fi
|
||||
|
||||
## Install the SSH server.
|
||||
[ "$DISABLE_SSH" -eq 0 ] && /bd_build/services/sshd/sshd.sh || true
|
||||
if [ "$DISABLE_SSH" -eq 0 ]; then
|
||||
/bd_build/services/sshd/sshd.sh
|
||||
fi
|
||||
|
||||
## Install cron daemon.
|
||||
[ "$DISABLE_CRON" -eq 0 ] && /bd_build/services/cron/cron.sh || true
|
||||
if [ "$DISABLE_CRON" -eq 0 ]; then
|
||||
/bd_build/services/cron/cron.sh
|
||||
fi
|
||||
Reference in new issue
Block a user