aaron/nextcloud-docker
0
0
Fork 0
mirror of https://github.com/nextcloud/docker.git synced 2025-03-15 19:05:09 +01:00
Code Activity

Fix Variables

Browse source 
Signed-off-by: Jonas Thelemann <e-mail@jonas-thelemann.de>
This commit is contained in:
Jonas Thelemann 2020-03-24 04:06:15 +01:00
parent d08c21133b
commit d073e53bac
No known key found for this signature in database
GPG key ID: 55253A8FC546418B
11 changed files with 43 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
16.0/apache/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
16.0/fpm-alpine/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
16.0/fpm/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
17.0/apache/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
17.0/fpm-alpine/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
17.0/fpm/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
18.0/apache/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
18.0/fpm-alpine/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

2
18.0/fpm/entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER

34
README.md
View file

@ -264,11 +264,13 @@ services:
volumes: volumes:
- db:/var/lib/postgresql/data - db:/var/lib/postgresql/data
environment: environment:
- POSTGRES_DB=nextcloud - POSTGRES_DB_FILE=/run/secrets/postgres_db
- POSTGRES_USER=nextcloud - POSTGRES_USER_FILE=/run/secrets/postgres_user
- POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
secrets: secrets:
- postgres_db
- postgres_password - postgres_password
- postgres_user
app: app:
image: nextcloud image: nextcloud
@ -279,28 +281,38 @@ services:
- nextcloud:/var/www/html - nextcloud:/var/www/html
environment: environment:
- POSTGRES_HOST=db - POSTGRES_HOST=db
- POSTGRES_DB=nextcloud - POSTGRES_DB_FILE=/run/secrets/postgres_db
- POSTGRES_USER=nextcloud - POSTGRES_USER_FILE=/run/secrets/postgres_user
- POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password - POSTGRES_PASSWORD_FILE=/run/secrets/postgres_password
- NEXTCLOUD_ADMIN_USER=superuser - NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/nextcloud_admin_password
- NEXTCLOUD_ADMIN_PASSWORD_FILE=/run/secrets/admin_password - NEXTCLOUD_ADMIN_USER_FILE=/run/secrets/nextcloud_admin_user
depends_on: depends_on:
- db - db
secrets: secrets:
- nextcloud_admin_password
- nextcloud_admin_user
- postgres_db
- postgres_password - postgres_password
- admin_password - postgres_user
volumes: volumes:
db: db:
nextcloud: nextcloud:
secrets: secrets:
nextcloud_admin_password:
file: ./nextcloud_admin_password.txt # put admin password to this file
nextcloud_admin_user:
file: ./nextcloud_admin_user.txt # put admin username to this file
postgres_db:
file: ./postgres_db.txt # put postgresql db name to this file
postgres_password: postgres_password:
file: ./postgres_password.txt # put postgresql password to this file file: ./postgres_password.txt # put postgresql password to this file
admin_password: postgres_user:
file: ./admin_password.txt # put admin password to this file file: ./postgres_user.txt # put postgresql username to this file
``` ```
Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `MYSQL_PASSWORD`, `POSTGRES_PASSWORD`.
Currently, this is only supported for `NEXTCLOUD_ADMIN_PASSWORD`, `NEXTCLOUD_ADMIN_USER`, `MYSQL_DB`, `MYSQL_PASSWORD`, `MYSQL_USER`, `POSTGRES_DB`, `POSTGRES_PASSWORD`, `POSTGRES_USER`.
# Make your Nextcloud available from the internet # Make your Nextcloud available from the internet
Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory. Until here, your Nextcloud is just available from you docker host. If you want your Nextcloud available from the internet adding SSL encryption is mandatory.

2
docker-entrypoint.sh
View file

@ -118,7 +118,9 @@ if expr "$1" : "apache" 1>/dev/null || [ "$1" = "php-fpm" ] || [ "${NEXTCLOUD_UP
install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"' install_options=$install_options' --data-dir "$NEXTCLOUD_DATA_DIR"'
fi fi
file_env MYSQL_DATABASE
file_env MYSQL_PASSWORD file_env MYSQL_PASSWORD
file_env MYSQL_USER
file_env POSTGRES_DB file_env POSTGRES_DB
file_env POSTGRES_PASSWORD file_env POSTGRES_PASSWORD
file_env POSTGRES_USER file_env POSTGRES_USER