From b23f32d45ede22110c60801eb924cc76f05b7ad2 Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:12:17 -0700 Subject: [PATCH 1/8] fixed protonmail bridge --- Template/template.json | 1 - 1 file changed, 1 deletion(-) diff --git a/Template/template.json b/Template/template.json index 49b49b8d..91d22a11 100644 --- a/Template/template.json +++ b/Template/template.json @@ -2541,7 +2541,6 @@ ], "platform": "linux", "restart_policy": "unless-stopped", - "interactive" : "true", "ports": [ "143/tcp", "25/tcp" From 0efd43027e660065ec84564c8a3f32ffc999dfa7 Mon Sep 17 00:00:00 2001 From: robocopAlpha <35454738+robocopAlpha@users.noreply.github.com> Date: Tue, 9 Jun 2020 16:25:25 +0000 Subject: [PATCH 2/8] Fix Lychee pictures volume --- Template/template.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Template/template.json b/Template/template.json index 91d22a11..4ab3ea58 100644 --- a/Template/template.json +++ b/Template/template.json @@ -1502,7 +1502,7 @@ "bind": "/portainer/Files/AppData/Config/Lychee" }, { - "container": "/config", + "container": "/pictures", "bind": "/portainer/Pictures" } ], @@ -3698,4 +3698,4 @@ } ] } -] \ No newline at end of file +] From 3b4b74cd1bc751310c71dfa778d7968bb5391a20 Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:40:14 -0700 Subject: [PATCH 3/8] fixed nextcloud typo --- Template/Stack/{Nextcloud.yml => nextcloud.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Template/Stack/{Nextcloud.yml => nextcloud.yml} (100%) diff --git a/Template/Stack/Nextcloud.yml b/Template/Stack/nextcloud.yml similarity index 100% rename from Template/Stack/Nextcloud.yml rename to Template/Stack/nextcloud.yml From 3f99a26e3e4e9ed539ed315f41ba6a2e3106f5c5 Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:42:24 -0700 Subject: [PATCH 4/8] fix nextcloud logo --- Template/template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Template/template.json b/Template/template.json index 4ab3ea58..4ff1f8fc 100644 --- a/Template/template.json +++ b/Template/template.json @@ -2013,7 +2013,7 @@ "title": "Nextcloud", "name": "nextcloud", "description": "Where are your photos and documents? With Nextcloud you pick a server of your choice, at home, in a data center or at a provider. And that is where your files will be. Nextcloud runs on that server, protecting your data and giving you access from your desktop or mobile devices.", - "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/bookstack2.png", + "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/nextcloud-icon.png", "categories": [ "Cloud", "Productivity", From 9f1e027364368b7198b90e23f66ee3bb2cbb84aa Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:47:08 -0700 Subject: [PATCH 5/8] added new DeeMix repo --- Template/template.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Template/template.json b/Template/template.json index 4ff1f8fc..8a9f8506 100644 --- a/Template/template.json +++ b/Template/template.json @@ -691,7 +691,7 @@ "name": "deemix", "description": "Deemix is a deezer downloader built from the ashes of Deezloader Remix.", "logo": "https://raw.githubusercontent.com/SelfhostedPro/selfhosted_templates/master/Images/deemix.png", - "image": "bocki/deemix:latest", + "image": "registry.gitlab.com/bockiii/deemix-docker", "categories": [ "Other", "Music" From cf4315856778c152be76694a9cca4802f81c3696 Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:51:49 -0700 Subject: [PATCH 6/8] fixed tests --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fafbcc98..39bcc3f1 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ }, "scripts": { "pretest": "jsonlint Template/template.json --quiet", - "test": "yaml-validator Template/Stack/*" + "test": "yaml-validator Template/Stack/OMV5/*" }, "repository": { "type": "git", From 01b693d863497550070d1480cfb0bc34bf0e2787 Mon Sep 17 00:00:00 2001 From: SelfhostedPro Date: Tue, 9 Jun 2020 09:53:47 -0700 Subject: [PATCH 7/8] fixed stack templates --- Template/Stack/nextcloud.yml | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/Template/Stack/nextcloud.yml b/Template/Stack/nextcloud.yml index c3137050..c724ddc7 100644 --- a/Template/Stack/nextcloud.yml +++ b/Template/Stack/nextcloud.yml @@ -2,7 +2,6 @@ version: "2" services: bookstack: -<<<<<<< HEAD image: linuxserver/nextcloud container_name: nextcloud environment: @@ -19,44 +18,14 @@ services: nextcloud_db: image: linuxserver/mariadb container_name: nextcloud_db -======= - image: linuxserver/bookstack - container_name: bookstack - environment: - - PUID=${PUID} - - PGID=${PGID} - - DB_HOST=bookstack_db - - DB_USER=bookstack - - DB_PASS=${DATABASE_PASSWORD} - - DB_DATABASE=bookstackapp - volumes: - - /srv/dev-disk-by-label-media/Files/AppData/Bookstack/Data:/config - ports: - - ${PORT}:80 - restart: unless-stopped - depends_on: - - bookstack_db - bookstack_db: - image: linuxserver/mariadb - container_name: bookstack_db ->>>>>>> d49214d76de6d630ae3e57b52dc5d0be3cc841dc environment: - PUID=${PUID} - PGID=${PGID} - MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD} -<<<<<<< HEAD - TZ=${Timezone} - MYSQL_DATABASE=nextcloud_db - MYSQL_USER=nextcloud - MYSQL_PASSWORD=${DATABASE_PASSWORD} volumes: - /srv/dev-disk-by-label-media/Files/AppData/Config/Nextcloud/DB:/config -======= - - TZ=${TZ} - - MYSQL_DATABASE=bookstackapp - - MYSQL_USER=bookstack - - MYSQL_PASSWORD=${DATABASE_PASSWORD} - volumes: - - /portainer/Files/AppData/Bookstack/DB:/config ->>>>>>> d49214d76de6d630ae3e57b52dc5d0be3cc841dc restart: unless-stopped From ad952ce71081d916c51fac2b44cedcef9d4b7ee7 Mon Sep 17 00:00:00 2001 From: SelfhostedPro <66331933+SelfhostedPro@users.noreply.github.com> Date: Tue, 9 Jun 2020 09:56:52 -0700 Subject: [PATCH 8/8] Update template.json --- Template/template.json | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Template/template.json b/Template/template.json index 743f9014..c0093351 100644 --- a/Template/template.json +++ b/Template/template.json @@ -1502,13 +1502,8 @@ "bind": "/srv/dev-disk-by-label-media/Files/AppData/Config/Lychee" }, { -<<<<<<< HEAD - "container": "/config", - "bind": "/srv/dev-disk-by-label-media/Pictures" -======= "container": "/pictures", - "bind": "/portainer/Pictures" ->>>>>>> d49214d76de6d630ae3e57b52dc5d0be3cc841dc + "bind": "/srv/dev-disk-by-label-media/Pictures" } ], "env": [