update nc 25.0.9

habi-dat · Jul 27, 2023 · 8e97497 · 8e97497
1 parent bc64697
commit 8e97497
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 22 deletions.
diff --git a/UPDATE v25.md b/UPDATE v25.md
@@ -0,0 +1,31 @@
+# export auth
+
+```
+./habidat.sh export auth
+```
+
+# export nexcloud
+
+```
+./habidat.sh export auth nodata
+```
+
+# export discourse
+
+```
+./habidat.sh export discourse
+```
+
+# pull new habidat-setup
+
+```
+git pull
+git checkout 25.0.9
+```
+
+# update nextcloud
+
+```
+update all apps in admin panel
+./habidat.sh update nextcloud
+```
diff --git a/habidat.sh b/habidat.sh
@@ -104,7 +104,7 @@ update_installed_modules() {
 		fi
 		sed -i '/HABIDAT_USER_INSTALLED_MODULES/d' store/auth/user.env
 		echo "HABIDAT_USER_INSTALLED_MODULES=$HABIDAT_USER_INSTALLED_MODULES" >> store/auth/user.env		
-		docker-compose -f store/auth/docker-compose.yml -p $HABIDAT_DOCKER_PREFIX-auth up -d user
+		#docker-compose -f store/auth/docker-compose.yml -p $HABIDAT_DOCKER_PREFIX-auth up -d user
 	fi
 }
 

diff --git a/nextcloud/docker-compose.yml b/nextcloud/docker-compose.yml
@@ -1,6 +1,6 @@
-version: '3.5'
+version: "3.5"
 
-volumes: 
+volumes:
   db:
   data:
 
@@ -12,15 +12,15 @@ networks:
     external:
       name: $HABIDAT_BACKEND_NETWORK
 
-services:  
+services:
   db:
     image: mariadb:10.5
     container_name: $HABIDAT_DOCKER_PREFIX-nextcloud-db
     restart: unless-stopped
     volumes:
       - db:/var/lib/mysql
     env_file:
-      - ./db.env  
+      - ./db.env
     networks:
       - $HABIDAT_DOCKER_PREFIX-back
     logging:
@@ -40,48 +40,48 @@ services:
         max-size: 50m
 
   redis:
-    image: redis
+    image: redis:6
     container_name: $HABIDAT_DOCKER_PREFIX-nextcloud-redis
     restart: unless-stopped
     networks:
-      - $HABIDAT_DOCKER_PREFIX-back      
+      - $HABIDAT_DOCKER_PREFIX-back
     command: redis-server --requirepass "$HABIDAT_NEXTCLOUD_REDIS_PASSWORD"
     logging:
       options:
-        max-size: 50m        
+        max-size: 50m
 
   nextcloud:
-    image: habidat/nextcloud:24.0.5
-#    build:
-#      context: ../../../habidat-nextcloud   
+    image: habidat/nextcloud:25.0.9
+    #    build:
+    #      context: ../../../habidat-nextcloud
     restart: unless-stopped
     container_name: $HABIDAT_DOCKER_PREFIX-nextcloud
     volumes:
       - data:/var/www/html
     env_file:
-      - ./nextcloud.env   
+      - ./nextcloud.env
     ports:
-      - 80      
+      - 80
     networks:
       - $HABIDAT_DOCKER_PREFIX-proxy
-      - $HABIDAT_DOCKER_PREFIX-back      
+      - $HABIDAT_DOCKER_PREFIX-back
     logging:
       options:
-        max-size: 50m  
+        max-size: 50m
 
   cron:
-    image: habidat/nextcloud:24.0.5
-#    build:
-#      context: ../../../habidat-nextcloud  
+    image: habidat/nextcloud:25.0.9
+    #    build:
+    #      context: ../../../habidat-nextcloud
     restart: unless-stopped
     container_name: $HABIDAT_DOCKER_PREFIX-nextcloud-cron
     volumes:
       - data:/var/www/html
     env_file:
-      - ./nextcloud.env   
+      - ./nextcloud.env
     networks:
-      - $HABIDAT_DOCKER_PREFIX-back      
+      - $HABIDAT_DOCKER_PREFIX-back
     entrypoint: /cron.sh
     logging:
       options:
-        max-size: 50m          
+        max-size: 50m
diff --git a/nextcloud/version b/nextcloud/version
@@ -1 +1 @@
-24.0.5
+25.0.9
diff --git a/package.json b/package.json
@@ -0,0 +1,9 @@
+{
+  "name": "habidat-setup",
+  "version": "25.0.9",
+  "description": "Setup scripts for habi*DAT platform",
+  "main": "habidat.sh",
+  "repository": "https://github.com/habi-dat/setup.git",
+  "author": "Florian Humer <florian.humer@gmail.com>",
+  "license": "MIT"
+}