Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 2 additions & 12 deletions .env.template
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ PHP_MEMORY_LIMIT=3458M

RUN_CONFIGURATION=True

NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.localhost nginx localhost:3100 hydra.localhost:9000 collabora.localhost
NEXTCLOUD_TRUSTED_DOMAINS=nextcloud.localhost nginx localhost:3100 hydra.localhost:9000
POST_CONFIG_COMMAND='sudo -u www-data PHP_MEMORY_LIMIT=512M php occ user_oidc:provider SchulcloudNextcloud --clientid="Nextcloud" --clientsecret="Nextcloud" --check-bearer="1" --unique-uid="0" --scope="openid offline profile email groups" --discoveryuri="http://hydra.localhost:9000/.well-known/openid-configuration"'

## Plugins
INSTALL_PLUGINS="groupfolders files_antivirus theming_customcss richdocuments user_oidc"
INSTALL_PLUGINS="groupfolders theming_customcss user_oidc"
EXTERNAL_GIT_PLUGINS="https://github.com/hpi-schul-cloud/NextcloudExtract.git:extract:master https://github.com/hpi-schul-cloud/schulcloud-nextcloud-app.git:schulcloud:main"
#EXTERNAL_ARCHIVE_PLUGINS="https://github.com/hpi-schul-cloud/user_oidc/releases/download/v1.3.0-alpha/user_oidc-v1.3.0-alpha.tar.gz:user_oidc"
ENABLE_PLUGINS="schulcloud extract theming"
Expand Down Expand Up @@ -134,16 +134,6 @@ CONFIG_JSON='{
"provider-1-groupProvisioning":"1",
"provider-1-providerBasedId":"1",
"id4me_enabled":"0"
},
"richdocuments": {
"wopi_url": "http:\/\/collabora.localhost:9090\/",
"public_wopi_url": "http:\/\/collabora.localhost:9090",
"types": "prevent_group_restriction",
"enabled": "yes",
"disable_certificate_verification": "",
"doc_format": "",
"use_groups": "",
"wopi_allowlist": ""
}
}
}'
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ RUN git clone https://github.com/remicollet/php-rar.git \
# php
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-ftp.ini
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-pdo_mysql.ini
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-redis.ini
# RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-redis.ini
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-ldap.ini
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-gmp.ini
RUN rm -rf /usr/local/etc/php/conf.d/docker-php-ext-sysvsem.ini
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Pushed tag ``` git tag x.y.z``` triggers the workflow which pushes the image to

## Build Container locally

You have the choice between helm and docker-compose to setup your schulcloud-nextcloud instance locally.
You have the choice between helm and docker compose to setup your schulcloud-nextcloud instance locally.

### With Helm

Expand Down Expand Up @@ -68,7 +68,7 @@ minio server and a temporary service for the nextcloud bucket creation.
The compose uses the `.env` to configure the environment. To start and build the images use:

```
docker-compose up --build
docker compose up --build
```

The compose file allows the mounting of plugins, so changes get transferred to the container automatically while it is
Expand Down
22 changes: 11 additions & 11 deletions compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ services:
- db
- storage
- cache
- antivirus
# - antivirus

storage:
image: minio/minio:latest
Expand Down Expand Up @@ -84,15 +84,15 @@ services:
- cache:/data
command: redis-server --requirepass ${REDIS_HOST_PASSWORD}

antivirus:
container_name: antivirus
image: clamav/clamav:stable_base
restart: unless-stopped
ports:
- 3310:3310
volumes:
# Socket
- antivirus:/var/lib/clamav
# antivirus:
# container_name: antivirus
# image: clamav/clamav:stable_base
# restart: unless-stopped
# ports:
# - 3310:3310
# volumes:
# # Socket
# - antivirus:/var/lib/clamav

# nginx here for simulate a ingress like in kubernetes
nginx:
Expand All @@ -112,7 +112,7 @@ volumes:
db:
nextcloud:
storage:
antivirus:
# antivirus:
cache:

networks:
Expand Down