|
|
@ -109,6 +109,7 @@ create_occ_if_not_exists() { |
|
|
|
read-0 LOGIN PASSWORD < "$PASSWORD_FILE" || exit 1 |
|
|
|
compose --debug --no-init --without-relation="$SERVICE_NAME":web-proxy run \ |
|
|
|
-v "$CHARM_PATH"/src/fake-apache:/usr/bin/apache \ |
|
|
|
-e NEXTCLOUD_DATA_DIR=/var/lib/nextcloud/data \ |
|
|
|
-e NEXTCLOUD_ADMIN_USER=$LOGIN \ |
|
|
|
-e NEXTCLOUD_ADMIN_PASSWORD=$PASSWORD \ |
|
|
|
--rm --entrypoint /entrypoint.sh "$SERVICE_NAME" apache 2>&1 |
|
|
@ -140,6 +141,7 @@ occ() { |
|
|
|
compose --debug -q --no-init --no-pre-deploy \ |
|
|
|
--without-relation="$SERVICE_NAME":web-proxy run \ |
|
|
|
"${occ_docker_run_opts[@]}" \ |
|
|
|
-e NEXTCLOUD_DATA_DIR=/var/lib/nextcloud/data \ |
|
|
|
-v "$HOST_CHARM_STORE/${CHARM_REL_PATH#${CHARM_STORE}/}/src/occ.batch:/var/www/html/occ.batch" \ |
|
|
|
-T --rm -u www-data "$SERVICE_NAME" /var/www/html/occ.batch "$@" | cat |
|
|
|
|
|
|
|