crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Regenerate SSH keys

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2019-07-20 17:20:22 +02:00
parent 85da01153c
commit 17c73fe546
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile.m4
View File

@@ -327,7 +327,10 @@ m4_ifelse(ENABLE_32BIT, 1, [[m4_dnl
xfce4-xkb-plugin \ xfce4-xkb-plugin \
xfpanel-switch \ xfpanel-switch \
xubuntu-default-settings \ xubuntu-default-settings \
&& rm -rf /var/lib/apt/lists/* && rm -rf \
/tmp/* /var/tmp/* \
/var/lib/apt/lists/* \
/etc/ssh/ssh_host_*
# Copy Tini build # Copy Tini build
m4_define([[TINI_IMAGE_TAG]], m4_ifdef([[CROSS_ARCH]], [[latest-CROSS_ARCH]], [[latest]]))m4_dnl m4_define([[TINI_IMAGE_TAG]], m4_ifdef([[CROSS_ARCH]], [[latest-CROSS_ARCH]], [[latest]]))m4_dnl

15
scripts/bin/docker-foreground-cmd
View File

@@ -2,11 +2,6 @@
set -eu set -eu
# Disable xdummy if there is no graphics card
if [ "${DISABLE_GPU:?}" = 'true' ] || [ ! -d /dev/dri/ ]; then
unlink /etc/service/xdummy
fi
# Create unprivileged user and group # Create unprivileged user and group
groupadd \ groupadd \
--gid "${UNPRIVILEGED_USER_GID:?}" \ --gid "${UNPRIVILEGED_USER_GID:?}" \
@@ -38,12 +33,22 @@ unset UNPRIVILEGED_USER_PASSWORD
# Dump environment variables # Dump environment variables
export-env >> /etc/profile.d/env.sh export-env >> /etc/profile.d/env.sh
# Disable xdummy if there is no graphics card
if [ "${DISABLE_GPU:?}" = 'true' ] || [ ! -d /dev/dri/ ]; then
unlink /etc/service/xdummy
fi
# Create RANDFILE if it does not exist # Create RANDFILE if it does not exist
RANDFILE=${RANDFILE-${HOME}/.rnd} RANDFILE=${RANDFILE-${HOME}/.rnd}
if [ ! -f "${RANDFILE}" ]; then if [ ! -f "${RANDFILE}" ]; then
dd if=/dev/urandom of="${RANDFILE}" bs=256 count=1 >/dev/null 2>&1 dd if=/dev/urandom of="${RANDFILE}" bs=256 count=1 >/dev/null 2>&1
fi fi
# Generate SSH keys if they do not exist
if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
DEBIAN_FRONTEND=noninteractive dpkg-reconfigure openssh-server
fi
# Generate self-signed certificate # Generate self-signed certificate
if [ ! -f "${RDP_TLS_KEY_PATH:?}" ] || [ ! -f "${RDP_TLS_CERT_PATH:?}" ]; then if [ ! -f "${RDP_TLS_KEY_PATH:?}" ] || [ ! -f "${RDP_TLS_CERT_PATH:?}" ]; then
KEY_FILE=${RDP_TLS_KEY_PATH:?} KEY_FILE=${RDP_TLS_KEY_PATH:?}