From 5ae268d195f3cdf27dfd9d0877c4761722a453c0 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 4 Nov 2024 23:03:07 +0100 Subject: [PATCH 1/8] switch to latest release and remove version from file --- apps/dokuwiki/docker-compose.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/apps/dokuwiki/docker-compose.yml b/apps/dokuwiki/docker-compose.yml index 21ac91d629..f03babdd3b 100644 --- a/apps/dokuwiki/docker-compose.yml +++ b/apps/dokuwiki/docker-compose.yml @@ -1,9 +1,7 @@ -version: "3" - services: dokuwiki: container_name: dokuwiki - image: lscr.io/linuxserver/dokuwiki:2022-07-31a-ls158 + image: lscr.io/linuxserver/dokuwiki:latest ports: - ${APP_PORT}:80 volumes: From b8e22e02ea1a55fde9530792b7fedd5192f08175 Mon Sep 17 00:00:00 2001 From: Victor Date: Mon, 4 Nov 2024 23:03:42 +0100 Subject: [PATCH 2/8] add dynamic config and switch to latest version of dokuwiki --- apps/dokuwiki/config.json | 5 +++-- apps/dokuwiki/docker-compose.json | 33 +++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) create mode 100644 apps/dokuwiki/docker-compose.json diff --git a/apps/dokuwiki/config.json b/apps/dokuwiki/config.json index aaee9df3a7..f71e2a0b66 100644 --- a/apps/dokuwiki/config.json +++ b/apps/dokuwiki/config.json @@ -4,9 +4,10 @@ "port": 8149, "available": true, "exposable": true, + "dynamic_config": true, "id": "dokuwiki", - "tipi_version": 2, - "version": "2022-07-31a-ls158", + "tipi_version": 3, + "version": "latest", "categories": ["media"], "description": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.", "short_desc": "DokuWiki is a simple to use and highly versatile Open Source wiki software ", diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json new file mode 100644 index 0000000000..83ba580d65 --- /dev/null +++ b/apps/dokuwiki/docker-compose.json @@ -0,0 +1,33 @@ +{ + "services": [ + { + "name": "dokuwiki", + "image": "lscr.io/linuxserver/dokuwiki:latest", + "isMain": true, + "internalPort": 80, + "volumes": [ + { + "hostPath": "${APP_DATA_DIR}/data/config", + "containerPath": "/config", + "readOnly": false + } + ], + "environment": { + "TZ": "${TZ}" + }, + "addPorts": [ + { + "containerPort": 80, + "hostPort": 8149, + "tcp": true + } + ], + "healthCheck": { + "test": "curl --fail http://localhost || exit 1", + "retries": 3, + "interval": "30s", + "timeout": "10s" + } + } + ] +} \ No newline at end of file From b69abd1407445c8148fb7cb48a626bda237a69e7 Mon Sep 17 00:00:00 2001 From: Victor Cighir Date: Thu, 7 Nov 2024 23:12:01 +0100 Subject: [PATCH 3/8] change dokuwiki version from latest to a specific string Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> --- apps/dokuwiki/docker-compose.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json index 83ba580d65..45804df1aa 100644 --- a/apps/dokuwiki/docker-compose.json +++ b/apps/dokuwiki/docker-compose.json @@ -2,7 +2,7 @@ "services": [ { "name": "dokuwiki", - "image": "lscr.io/linuxserver/dokuwiki:latest", + "image": "lscr.io/linuxserver/dokuwiki:version-2023-04-04", "isMain": true, "internalPort": 80, "volumes": [ From 24a1236cf1ec31875765fb16425ef3df4ce59950 Mon Sep 17 00:00:00 2001 From: Victor Date: Thu, 7 Nov 2024 23:14:06 +0100 Subject: [PATCH 4/8] update version of dokuwiki --- apps/dokuwiki/config.json | 2 +- apps/dokuwiki/docker-compose.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokuwiki/config.json b/apps/dokuwiki/config.json index f71e2a0b66..6994356479 100644 --- a/apps/dokuwiki/config.json +++ b/apps/dokuwiki/config.json @@ -7,7 +7,7 @@ "dynamic_config": true, "id": "dokuwiki", "tipi_version": 3, - "version": "latest", + "version": "version-2024-02-06b", "categories": ["media"], "description": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.", "short_desc": "DokuWiki is a simple to use and highly versatile Open Source wiki software ", diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json index 45804df1aa..f72859307c 100644 --- a/apps/dokuwiki/docker-compose.json +++ b/apps/dokuwiki/docker-compose.json @@ -2,7 +2,7 @@ "services": [ { "name": "dokuwiki", - "image": "lscr.io/linuxserver/dokuwiki:version-2023-04-04", + "image": "lscr.io/linuxserver/dokuwiki:version-2024-02-06b", "isMain": true, "internalPort": 80, "volumes": [ From 9462d1f69c936521918177b802492bd7d6cec189 Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Dec 2024 21:54:18 +0100 Subject: [PATCH 5/8] remove "add ports" section --- apps/dokuwiki/docker-compose.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json index f72859307c..8358be5d39 100644 --- a/apps/dokuwiki/docker-compose.json +++ b/apps/dokuwiki/docker-compose.json @@ -15,13 +15,6 @@ "environment": { "TZ": "${TZ}" }, - "addPorts": [ - { - "containerPort": 80, - "hostPort": 8149, - "tcp": true - } - ], "healthCheck": { "test": "curl --fail http://localhost || exit 1", "retries": 3, From 0b472939301db00d7e8d0d1bb58a71814984eadf Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Dec 2024 21:54:42 +0100 Subject: [PATCH 6/8] change dokuwiki version to match the one in docker-compose file --- apps/dokuwiki/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/dokuwiki/docker-compose.yml b/apps/dokuwiki/docker-compose.yml index f03babdd3b..8978b4b663 100644 --- a/apps/dokuwiki/docker-compose.yml +++ b/apps/dokuwiki/docker-compose.yml @@ -1,7 +1,7 @@ services: dokuwiki: container_name: dokuwiki - image: lscr.io/linuxserver/dokuwiki:latest + image: lscr.io/linuxserver/dokuwiki:version-2024-02-06b ports: - ${APP_PORT}:80 volumes: From 35ff4b912f027d214b8e29d6248b43f9fd0c455a Mon Sep 17 00:00:00 2001 From: Victor Date: Tue, 24 Dec 2024 21:56:43 +0100 Subject: [PATCH 7/8] change to dokuwiki to "latest" version from lscr.io/linuxserver --- apps/dokuwiki/docker-compose.json | 2 +- apps/dokuwiki/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json index 8358be5d39..4c98ae9593 100644 --- a/apps/dokuwiki/docker-compose.json +++ b/apps/dokuwiki/docker-compose.json @@ -2,7 +2,7 @@ "services": [ { "name": "dokuwiki", - "image": "lscr.io/linuxserver/dokuwiki:version-2024-02-06b", + "image": "lscr.io/linuxserver/dokuwiki:latest", "isMain": true, "internalPort": 80, "volumes": [ diff --git a/apps/dokuwiki/docker-compose.yml b/apps/dokuwiki/docker-compose.yml index 8978b4b663..f03babdd3b 100644 --- a/apps/dokuwiki/docker-compose.yml +++ b/apps/dokuwiki/docker-compose.yml @@ -1,7 +1,7 @@ services: dokuwiki: container_name: dokuwiki - image: lscr.io/linuxserver/dokuwiki:version-2024-02-06b + image: lscr.io/linuxserver/dokuwiki:latest ports: - ${APP_PORT}:80 volumes: From f517a9217bc179584dc78071b6be20508d9d6db9 Mon Sep 17 00:00:00 2001 From: Victor Date: Wed, 25 Dec 2024 15:10:31 +0100 Subject: [PATCH 8/8] pin stable version of dokuwiki --- apps/dokuwiki/config.json | 4 ++-- apps/dokuwiki/docker-compose.json | 4 ++-- apps/dokuwiki/docker-compose.yml | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/dokuwiki/config.json b/apps/dokuwiki/config.json index 6994356479..5bb4ee75b8 100644 --- a/apps/dokuwiki/config.json +++ b/apps/dokuwiki/config.json @@ -7,7 +7,7 @@ "dynamic_config": true, "id": "dokuwiki", "tipi_version": 3, - "version": "version-2024-02-06b", + "version": "2024-02-06b-ls250", "categories": ["media"], "description": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database. It is loved by users for its clean and readable syntax. The ease of maintenance, backup and integration makes it an administrator's favorite. Built in access controls and authentication connectors make DokuWiki especially useful in the enterprise context and the large number of plugins contributed by its vibrant community allow for a broad range of use cases beyond a traditional wiki.", "short_desc": "DokuWiki is a simple to use and highly versatile Open Source wiki software ", @@ -17,5 +17,5 @@ "form_fields": [], "supported_architectures": ["arm64", "amd64"], "created_at": 1691943801422, - "updated_at": 1723566283000 + "updated_at": 1735117834847 } diff --git a/apps/dokuwiki/docker-compose.json b/apps/dokuwiki/docker-compose.json index 4c98ae9593..9eb4e4f33b 100644 --- a/apps/dokuwiki/docker-compose.json +++ b/apps/dokuwiki/docker-compose.json @@ -2,7 +2,7 @@ "services": [ { "name": "dokuwiki", - "image": "lscr.io/linuxserver/dokuwiki:latest", + "image": "lscr.io/linuxserver/dokuwiki:2024-02-06b-ls250", "isMain": true, "internalPort": 80, "volumes": [ @@ -23,4 +23,4 @@ } } ] -} \ No newline at end of file +} diff --git a/apps/dokuwiki/docker-compose.yml b/apps/dokuwiki/docker-compose.yml index f03babdd3b..50754abcfd 100644 --- a/apps/dokuwiki/docker-compose.yml +++ b/apps/dokuwiki/docker-compose.yml @@ -1,7 +1,7 @@ services: dokuwiki: container_name: dokuwiki - image: lscr.io/linuxserver/dokuwiki:latest + image: lscr.io/linuxserver/dokuwiki:2024-02-06b-ls250 ports: - ${APP_PORT}:80 volumes: