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 diff --git a/docker/netbird/docker-compose.yml b/docker/netbird/docker-compose.yml index 090cbe0..307f2ea 100644 --- a/docker/netbird/docker-compose.yml +++ b/docker/netbird/docker-compose.yml @@ -23,7 +23,7 @@ services: max-size: "500m" max-file: "2" signal: - image: netbirdio/signal:0.59.2 + image: netbirdio/signal:0.59.8 restart: unless-stopped volumes: - netbird-signal:/var/lib/netbird @@ -35,7 +35,7 @@ services: max-size: "500m" max-file: "2" relay: - image: netbirdio/relay:0.59.2 + image: netbirdio/relay:0.59.8 restart: unless-stopped environment: NB_LOG_LEVEL: ${NB_LOG_LEVEL:-info} @@ -50,7 +50,7 @@ services: max-size: "500m" max-file: "2" management: - image: netbirdio/management:0.59.2 + image: netbirdio/management:0.59.8 restart: unless-stopped depends_on: - dashboard diff --git a/k8s/argo-apps/renovate.yaml b/k8s/argo-apps/renovate.yaml index cee6aa1..4cc0706 100644 --- a/k8s/argo-apps/renovate.yaml +++ b/k8s/argo-apps/renovate.yaml @@ -13,7 +13,7 @@ spec: sources: - chart: renovate repoURL: https://docs.renovatebot.com/helm-charts - targetRevision: 43.54.* + targetRevision: 44.15.* helm: valuesObject: renovate: