mirror of
https://github.com/nextcloud/all-in-one.git
synced 2026-02-15 10:10:17 +00:00
Compare commits
No commits in common. "d0bac46b94f16a7bb408b3fa072e0a2e62b0511e" and "7f8be1bc3d6d77391dfd8b11be5ec07d1bb5e88d" have entirely different histories.
d0bac46b94
...
7f8be1bc3d
4 changed files with 1 additions and 9 deletions
|
|
@ -11,7 +11,6 @@ RUN set -ex; \
|
|||
netcat-openbsd \
|
||||
tzdata \
|
||||
bash \
|
||||
jq \
|
||||
openssl; \
|
||||
# Give root a random password
|
||||
echo "root:$(openssl rand -base64 12)" | chpasswd; \
|
||||
|
|
|
|||
|
|
@ -70,10 +70,6 @@ if [ "$POSTGRES_USER" = nextcloud ]; then
|
|||
export POSTGRES_USER
|
||||
fi
|
||||
|
||||
# URL-encode passwords
|
||||
POSTGRES_PASSWORD="$(jq -rn --arg v "$POSTGRES_PASSWORD" '$v|@uri')"
|
||||
REDIS_HOST_PASSWORD="$(jq -rn --arg v "$REDIS_HOST_PASSWORD" '$v|@uri')"
|
||||
|
||||
# Postgres root cert
|
||||
if [ -f "/nextcloud/data/certificates/POSTGRES" ]; then
|
||||
CERT_OPTIONS="?sslmode=verify-ca&sslrootcert=/nextcloud/data/certificates/ca-bundle.crt"
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ FROM ghcr.io/nextcloud-releases/whiteboard:v1.5.0
|
|||
|
||||
USER root
|
||||
RUN set -ex; \
|
||||
apk add --no-cache bash jq; \
|
||||
apk add --no-cache bash; \
|
||||
chmod 777 -R /tmp; \
|
||||
if [ -f /usr/lib/chromium/chrome_crashpad_handler ] && [ ! -f /usr/lib/chromium/chrome_crashpad_handler.real ]; then \
|
||||
mv /usr/lib/chromium/chrome_crashpad_handler /usr/lib/chromium/chrome_crashpad_handler.real; \
|
||||
|
|
|
|||
|
|
@ -11,9 +11,6 @@ if [ -z "$REDIS_DB_INDEX" ]; then
|
|||
REDIS_DB_INDEX=0
|
||||
fi
|
||||
|
||||
# URL-encode password
|
||||
REDIS_HOST_PASSWORD="$(jq -rn --arg v "$REDIS_HOST_PASSWORD" '$v|@uri')"
|
||||
|
||||
export REDIS_URL="redis://$REDIS_USER:$REDIS_HOST_PASSWORD@$REDIS_HOST:$REDIS_PORT/$REDIS_DB_INDEX"
|
||||
|
||||
# Run it
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue