Compare commits

...

9 Commits

Author SHA1 Message Date
javielico
8b138eac19
Reverting back gitignore 2022-11-13 00:51:03 +00:00
javielico
819378f3fb
Changes to cron version image 2022-11-12 12:53:29 +00:00
javielico
8dcc2925ea
Version numbers back up 2022-11-11 22:04:50 +00:00
javielico
2ec6f21dd1
Up version on Nginx and Nextcloud to stable 2022-11-11 17:26:15 +00:00
javielico
9a070231c7
Adding some more variables on ignore 2022-11-11 17:18:42 +00:00
63ce9a6fb9 Merge pull request 'Automatically install apps specified via env variable.' (#29) from auto_app_install into main
Reviewed-on: coop-cloud/nextcloud#29
2022-11-09 09:48:22 +00:00
827cb16964 abra.sh post-deployment command to install apps 2022-11-08 16:39:32 +01:00
992992d678 Revert "Automatically install apps specified via env variable." for entrypoint.sh.tmpl
This reverts commit 20f0a45baf110a6b5575b2403f6c8cd5dab714c8 for entrypoint.sh.tmpl
2022-11-08 15:41:37 +01:00
20f0a45baf Automatically install apps specified via env variable. 2022-11-08 12:31:24 +01:00
5 changed files with 24 additions and 9 deletions

View File

@ -19,3 +19,5 @@ EXTRA_VOLUME=/dev/null:/tmp/.dummy
# X_FRAME_OPTIONS_ENABLED=1
# X_FRAME_OPTIONS_ALLOW_FROM=embedding-site.example.org
# APPS="calendar sociallogin onlyoffice"

1
.gitignore vendored
View File

@ -1 +1,2 @@
/.envrc

View File

@ -1,5 +0,0 @@
{
"shellcheck.customArgs": [
"--shell=bash"
]
}

16
abra.sh
View File

@ -13,6 +13,22 @@ sub_occ(){
sub_app_run php /var/www/html/occ "$@"
}
run_occ(){
su -p www-data -s /bin/sh -c "/var/www/html/occ $@"
}
install_apps(){
install_apps="$@"
if [ -z "$install_apps" ]
then
install_apps=$APPS
fi
for app in $install_apps
do
run_occ "app:install $app"
done
}
_backup_app() {
# Copied _abra_backup_dir to make UX better on restore and backup
{

View File

@ -1,7 +1,7 @@
version: "3.8"
services:
web:
image: nginx:1.23.1
image: nginx:1.22.1
configs:
- source: nginx_conf
target: /etc/nginx/nginx.conf
@ -35,7 +35,7 @@ services:
- "traefik.http.middlewares.${STACK_NAME}-redirect.headers.SSLHost=${DOMAIN}"
app:
image: nextcloud:24.0.6-fpm
image: nextcloud:25.0.1-fpm
depends_on:
- db
configs:
@ -49,6 +49,7 @@ services:
- db_password
- admin_password
environment:
- APPS
- X_FRAME_OPTIONS_ALLOW_FROM
- X_FRAME_OPTIONS_ENABLED
- DOMAIN
@ -77,12 +78,12 @@ services:
failure_action: rollback
order: start-first
labels:
- "coop-cloud.${STACK_NAME}.version=2.1.4+24.0.6-fpm"
- "coop-cloud.${STACK_NAME}.version=2.1.6+25.0.1-fpm"
- "backupbot.backup=true"
- "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/"
cron:
image: nextcloud:24.0.6-fpm
image: nextcloud:25.0.1-fpm
volumes:
- nextcloud:/var/www/html/
- nextapps:/var/www/html/custom_apps:cached