From 9a070231c7dc9e6ccc62bb0088f3f9a15046da77 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 17:18:42 +0000 Subject: [PATCH 1/5] Adding some more variables on ignore --- .gitignore | 87 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/.gitignore b/.gitignore index 37b52cc..82ede8d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,88 @@ /.envrc + +### Linux ### +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +### macOS ### +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +### macOS Patch ### +# iCloud generated files +*.icloud + +### Vim ### +# Swap +[._]*.s[a-v][a-z] +!*.svg # comment out if you don't need vector files +[._]*.sw[a-p] +[._]s[a-rt-v][a-z] +[._]ss[a-gi-z] +[._]sw[a-p] + +# Session +Session.vim +Sessionx.vim + +# Temporary +.netrwhist +# Auto-generated tag files +tags +# Persistent undo +[._]*.un~ + +### VisualStudioCode ### +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +!.vscode/*.code-snippets + +# Local History for Visual Studio Code +.history/ + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide -- 2.49.0 From 2ec6f21dd10837fc6fd5a1c8e1aecc285431c8bb Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 17:26:15 +0000 Subject: [PATCH 2/5] Up version on Nginx and Nextcloud to stable --- .vscode/settings.json | 5 ----- compose.yml | 8 ++++---- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 .vscode/settings.json diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index daa4954..0000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "shellcheck.customArgs": [ - "--shell=bash" - ] -} \ No newline at end of file diff --git a/compose.yml b/compose.yml index 71c123d..d8e127e 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: web: - image: nginx:1.23.1 + image: nginx:stable 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:stable-fpm depends_on: - db configs: @@ -78,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.5+stable-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:stable-fpm volumes: - nextcloud:/var/www/html/ - nextapps:/var/www/html/custom_apps:cached -- 2.49.0 From 8dcc2925ea75c2985f82f6811bb2f994d54a6d84 Mon Sep 17 00:00:00 2001 From: javielico Date: Fri, 11 Nov 2022 22:04:50 +0000 Subject: [PATCH 3/5] Version numbers back up --- compose.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/compose.yml b/compose.yml index d8e127e..b055321 100644 --- a/compose.yml +++ b/compose.yml @@ -1,7 +1,7 @@ version: "3.8" services: web: - image: nginx:stable + 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:stable-fpm + image: nextcloud:25.0.1-fpm depends_on: - db configs: @@ -78,7 +78,7 @@ services: failure_action: rollback order: start-first labels: - - "coop-cloud.${STACK_NAME}.version=2.1.5+stable-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/" -- 2.49.0 From 819378f3fb4f7aaf3468d376cdf956daf88e6508 Mon Sep 17 00:00:00 2001 From: javielico Date: Sat, 12 Nov 2022 12:53:29 +0000 Subject: [PATCH 4/5] Changes to cron version image --- compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose.yml b/compose.yml index b055321..9b7d98d 100644 --- a/compose.yml +++ b/compose.yml @@ -83,7 +83,7 @@ services: - "backupbot.backup.path=/var/www/html/config/,/var/www/html/data/,/var/www/html/custom_apps/" cron: - image: nextcloud:stable-fpm + image: nextcloud:25.0.1-fpm volumes: - nextcloud:/var/www/html/ - nextapps:/var/www/html/custom_apps:cached -- 2.49.0 From 8b138eac197726698c42ff30c2df6e61781b6da5 Mon Sep 17 00:00:00 2001 From: javielico Date: Sun, 13 Nov 2022 00:51:03 +0000 Subject: [PATCH 5/5] Reverting back gitignore --- .gitignore | 86 ------------------------------------------------------ 1 file changed, 86 deletions(-) diff --git a/.gitignore b/.gitignore index 82ede8d..409415b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,88 +1,2 @@ /.envrc -### Linux ### -*~ - -# temporary files which can be created if a process still has a handle open of a deleted file -.fuse_hidden* - -# KDE directory preferences -.directory - -# Linux trash folder which might appear on any partition or disk -.Trash-* - -# .nfs files are created when an open file is removed but is still being accessed -.nfs* - -### macOS ### -# General -.DS_Store -.AppleDouble -.LSOverride - -# Icon must end with two \r -Icon - - -# Thumbnails -._* - -# Files that might appear in the root of a volume -.DocumentRevisions-V100 -.fseventsd -.Spotlight-V100 -.TemporaryItems -.Trashes -.VolumeIcon.icns -.com.apple.timemachine.donotpresent - -# Directories potentially created on remote AFP share -.AppleDB -.AppleDesktop -Network Trash Folder -Temporary Items -.apdisk - -### macOS Patch ### -# iCloud generated files -*.icloud - -### Vim ### -# Swap -[._]*.s[a-v][a-z] -!*.svg # comment out if you don't need vector files -[._]*.sw[a-p] -[._]s[a-rt-v][a-z] -[._]ss[a-gi-z] -[._]sw[a-p] - -# Session -Session.vim -Sessionx.vim - -# Temporary -.netrwhist -# Auto-generated tag files -tags -# Persistent undo -[._]*.un~ - -### VisualStudioCode ### -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json -!.vscode/*.code-snippets - -# Local History for Visual Studio Code -.history/ - -# Built Visual Studio Code Extensions -*.vsix - -### VisualStudioCode Patch ### -# Ignore all local history of files -.history -.ionide -- 2.49.0