From 0c498a6d85415a253a3703fe56d1400e0fab1c7e Mon Sep 17 00:00:00 2001 From: Hane Date: Wed, 22 Oct 2025 22:40:52 +0200 Subject: [PATCH 1/5] feat: add dokuwiki --- docker/dokuwiki/Containerfile | 13 +++++++++++++ docker/dokuwiki/docker-compose.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 docker/dokuwiki/Containerfile create mode 100644 docker/dokuwiki/docker-compose.yml diff --git a/docker/dokuwiki/Containerfile b/docker/dokuwiki/Containerfile new file mode 100644 index 0000000..0fc0af9 --- /dev/null +++ b/docker/dokuwiki/Containerfile @@ -0,0 +1,13 @@ +FROM docker.io/library/debian:latest +ARG WIKI_NAME="dokuwiki" +ARG WEB_DIR="/var/www" +ARG APACHE_CONFIG_DIR="/etc/apache2" +EXPOSE 443/tcp + +USER root + +RUN apt-get update && apt-get full-upgrade -y && apt-get install vim apache2 libapache2-mod-php w3m php-cli php-xml -y +RUN rm ${APACHE_CONFIG_DIR}/sites-enabled/000-default.conf && a2enmod ssl +RUN ["/bin/bash", "-c", "echo 'date.timezone = \"Europe/Madrid\"' >> /etc/php/*/apache2/php.ini"] + +STOPSIGNAL SIGWINCH diff --git a/docker/dokuwiki/docker-compose.yml b/docker/dokuwiki/docker-compose.yml new file mode 100644 index 0000000..4637aee --- /dev/null +++ b/docker/dokuwiki/docker-compose.yml @@ -0,0 +1,26 @@ +services: + wiki: + name: hane-dokuwiki + image: hane-dokuwiki-image + build: ./ + volumes: + - type: volume + source: dokuwiki + target: /var/www/dokuwiki + - type: bind + source: /mnt/nas1/shared/dokuwiki/apache2.conf + target: /etc/apache2/apache2.conf + - type: bind + source: /mnt/nas1/shared/dokuwiki/001-wiki.conf + target: /etc/apache2/sites-enabled/001-wiki.conf + - /mnt/nas1/shared/dokuwiki/init.sh:/init.sh + ports: + - "44344:443/tcp" + entrypoint: /init.sh + +volumes: + dokuwiki: + external: true + labels: + - "dev.roboces.wiki=Dokuwiki volume" + name: dokuwiki From 6817bd339803f890b5fec9a5407def8d91b6d45d Mon Sep 17 00:00:00 2001 From: Hane Date: Thu, 23 Oct 2025 19:15:14 +0200 Subject: [PATCH 2/5] fixed image uri --- docker/dokuwiki/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/dokuwiki/docker-compose.yml b/docker/dokuwiki/docker-compose.yml index 4637aee..673933d 100644 --- a/docker/dokuwiki/docker-compose.yml +++ b/docker/dokuwiki/docker-compose.yml @@ -1,8 +1,7 @@ services: wiki: name: hane-dokuwiki - image: hane-dokuwiki-image - build: ./ + image: git.roboces.dev/hane/fukuops/hane-dokuwiki-image:latest volumes: - type: volume source: dokuwiki From b938cffd4562e3d0c25e44dbf23dc5bb31d283d5 Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Wed, 22 Oct 2025 02:24:40 +0000 Subject: [PATCH 3/5] chore(deps): update netbirdio/netbird docker tag to v0.59.8 --- docker/netbird/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/netbird/docker-compose.yml b/docker/netbird/docker-compose.yml index 307f2ea..4a93255 100644 --- a/docker/netbird/docker-compose.yml +++ b/docker/netbird/docker-compose.yml @@ -91,7 +91,7 @@ services: max-file: "2" peer-1: - image: netbirdio/netbird:0.59.0 + image: netbirdio/netbird:0.59.8 restart: unless-stopped volumes: - ${NETBIRD_PEER_VOLUME:-/mnt/nas1/shared/netbird/peer-1}/data:/etc/netbird From 9547e3c59129b44014827c1bafb95651919a6381 Mon Sep 17 00:00:00 2001 From: Hane Date: Wed, 22 Oct 2025 22:40:52 +0200 Subject: [PATCH 4/5] feat: add dokuwiki --- docker/dokuwiki/Containerfile | 13 +++++++++++++ docker/dokuwiki/docker-compose.yml | 26 ++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 docker/dokuwiki/Containerfile create mode 100644 docker/dokuwiki/docker-compose.yml diff --git a/docker/dokuwiki/Containerfile b/docker/dokuwiki/Containerfile new file mode 100644 index 0000000..0fc0af9 --- /dev/null +++ b/docker/dokuwiki/Containerfile @@ -0,0 +1,13 @@ +FROM docker.io/library/debian:latest +ARG WIKI_NAME="dokuwiki" +ARG WEB_DIR="/var/www" +ARG APACHE_CONFIG_DIR="/etc/apache2" +EXPOSE 443/tcp + +USER root + +RUN apt-get update && apt-get full-upgrade -y && apt-get install vim apache2 libapache2-mod-php w3m php-cli php-xml -y +RUN rm ${APACHE_CONFIG_DIR}/sites-enabled/000-default.conf && a2enmod ssl +RUN ["/bin/bash", "-c", "echo 'date.timezone = \"Europe/Madrid\"' >> /etc/php/*/apache2/php.ini"] + +STOPSIGNAL SIGWINCH diff --git a/docker/dokuwiki/docker-compose.yml b/docker/dokuwiki/docker-compose.yml new file mode 100644 index 0000000..4637aee --- /dev/null +++ b/docker/dokuwiki/docker-compose.yml @@ -0,0 +1,26 @@ +services: + wiki: + name: hane-dokuwiki + image: hane-dokuwiki-image + build: ./ + volumes: + - type: volume + source: dokuwiki + target: /var/www/dokuwiki + - type: bind + source: /mnt/nas1/shared/dokuwiki/apache2.conf + target: /etc/apache2/apache2.conf + - type: bind + source: /mnt/nas1/shared/dokuwiki/001-wiki.conf + target: /etc/apache2/sites-enabled/001-wiki.conf + - /mnt/nas1/shared/dokuwiki/init.sh:/init.sh + ports: + - "44344:443/tcp" + entrypoint: /init.sh + +volumes: + dokuwiki: + external: true + labels: + - "dev.roboces.wiki=Dokuwiki volume" + name: dokuwiki From 5399b6c671eddde3258ac8e555d6df738038266f Mon Sep 17 00:00:00 2001 From: Hane Date: Thu, 23 Oct 2025 19:15:14 +0200 Subject: [PATCH 5/5] fixed image uri --- docker/dokuwiki/docker-compose.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/docker/dokuwiki/docker-compose.yml b/docker/dokuwiki/docker-compose.yml index 4637aee..673933d 100644 --- a/docker/dokuwiki/docker-compose.yml +++ b/docker/dokuwiki/docker-compose.yml @@ -1,8 +1,7 @@ services: wiki: name: hane-dokuwiki - image: hane-dokuwiki-image - build: ./ + image: git.roboces.dev/hane/fukuops/hane-dokuwiki-image:latest volumes: - type: volume source: dokuwiki