mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-09-18 17:27:24 +00:00
do not give root a random password if login is already disabled by default (#8608)
This commit is contained in:
@@ -31,7 +31,6 @@ RUN set -ex; \
|
||||
supervisor \
|
||||
tzdata \
|
||||
ca-certificates \
|
||||
openssl \
|
||||
bind-tools \
|
||||
netcat-openbsd; \
|
||||
\
|
||||
@@ -91,10 +90,7 @@ RUN set -ex; \
|
||||
mkdir -p /usr/local/apache2/logs; \
|
||||
chmod 777 -R /home/www-data; \
|
||||
chmod 777 -R /usr/local/apache2/logs; \
|
||||
rm -rf /usr/local/apache2/cgi-bin/; \
|
||||
\
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
apk --no-cache del openssl
|
||||
rm -rf /usr/local/apache2/cgi-bin/
|
||||
|
||||
USER www-data:www-data
|
||||
|
||||
|
||||
@@ -11,12 +11,7 @@ RUN set -ex; \
|
||||
ca-certificates \
|
||||
netcat-openbsd \
|
||||
tzdata \
|
||||
bash \
|
||||
openssl; \
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
apk del --no-cache \
|
||||
openssl; \
|
||||
bash; \
|
||||
delgroup www-data; \
|
||||
addgroup -g 33 -S www-data; \
|
||||
adduser -u 33 -S -D -G www-data -H -s /sbin/nologin www-data;
|
||||
|
||||
@@ -13,7 +13,6 @@ RUN set -ex; \
|
||||
apk upgrade --no-cache -a; \
|
||||
apk add --no-cache \
|
||||
bash \
|
||||
openssl \
|
||||
shadow \
|
||||
netcat-openbsd \
|
||||
grep; \
|
||||
@@ -35,10 +34,6 @@ RUN set -ex; \
|
||||
mkdir /mnt/data; \
|
||||
chown postgres:postgres /mnt/data; \
|
||||
\
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
apk --no-cache del openssl; \
|
||||
\
|
||||
# Get rid of unused binaries
|
||||
rm -f /usr/local/bin/gosu /usr/local/bin/su-exec;
|
||||
|
||||
|
||||
@@ -7,14 +7,7 @@ COPY --chmod=775 start.sh /start.sh
|
||||
SHELL ["/bin/ash", "-o", "pipefail", "-c"]
|
||||
RUN set -ex; \
|
||||
apk upgrade --no-cache -a; \
|
||||
apk add --no-cache openssl bash; \
|
||||
\
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
apk --no-cache del openssl; \
|
||||
\
|
||||
# Get rid of unused binaries
|
||||
rm -f /usr/local/bin/gosu;
|
||||
apk add --no-cache bash
|
||||
|
||||
COPY --chmod=775 healthcheck.sh /healthcheck.sh
|
||||
|
||||
|
||||
@@ -32,7 +32,6 @@ RUN set -ex; \
|
||||
wget \
|
||||
shadow \
|
||||
pulseaudio \
|
||||
openssl \
|
||||
build-base \
|
||||
linux-headers \
|
||||
geckodriver; \
|
||||
@@ -40,8 +39,7 @@ RUN set -ex; \
|
||||
apk add --no-cache intel-media-driver; \
|
||||
fi; \
|
||||
useradd -d /tmp --system recording -u 122; \
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
\
|
||||
git clone --recursive https://github.com/nextcloud/nextcloud-talk-recording --depth=1 --single-branch --branch "$RECORDING_VERSION" /src; \
|
||||
python3 -m pip install --no-cache-dir /src; \
|
||||
rm -rf /src; \
|
||||
@@ -55,7 +53,6 @@ RUN set -ex; \
|
||||
git \
|
||||
wget \
|
||||
shadow \
|
||||
openssl \
|
||||
build-base \
|
||||
linux-headers;
|
||||
|
||||
|
||||
@@ -56,9 +56,6 @@ RUN set -ex; \
|
||||
apk del --no-cache \
|
||||
shadow; \
|
||||
\
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
\
|
||||
touch \
|
||||
/etc/nats.conf \
|
||||
/etc/eturnal.yml; \
|
||||
|
||||
Reference in New Issue
Block a user