From 9f931102a0266868881ab70e4379d59e41596169 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?c=C4=83t=C4=83lin?= Date: Mon, 27 Oct 2025 23:56:33 +0100 Subject: [PATCH] feat: remove valheim --- docker/dokuwiki/Containerfile | 13 -------- docker/dokuwiki/docker-compose.yml | 24 +++++++-------- docker/minecraft/docker-compose.yml | 40 ------------------------ k8s/argo-apps/valheim.yaml | 41 ------------------------- k8s/services/forgejo/sealedsecrets.yaml | 1 + k8s/services/redis/sealedsecrets.yaml | 1 + 6 files changed, 13 insertions(+), 107 deletions(-) delete mode 100644 docker/dokuwiki/Containerfile delete mode 100644 docker/minecraft/docker-compose.yml delete mode 100644 k8s/argo-apps/valheim.yaml diff --git a/docker/dokuwiki/Containerfile b/docker/dokuwiki/Containerfile deleted file mode 100644 index 0fc0af9..0000000 --- a/docker/dokuwiki/Containerfile +++ /dev/null @@ -1,13 +0,0 @@ -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 index 8ae1f6e..e0b7419 100644 --- a/docker/dokuwiki/docker-compose.yml +++ b/docker/dokuwiki/docker-compose.yml @@ -1,15 +1,13 @@ +--- services: - wiki: - image: git.roboces.dev/catalin/fukuops:dokuwiki - volumes: - - /mnt/nas1/shared/dokuwiki/dokuwiki:/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 + wiki: + image: dokuwiki/dokuwiki:2024-02-06b + restart: unless-stopped ports: - - "44344:443/tcp" - entrypoint: /init.sh + - "44344:8080" + volumes: + - /mnt/nas1/shared/dokuwiki/dokuwiki:/storage + environment: + PHP_TIMEZONE: Europe/Madrid + PHP_MEMORYLIMIT: 512M + PHP_UPLOADLIMIT: 128M diff --git a/docker/minecraft/docker-compose.yml b/docker/minecraft/docker-compose.yml deleted file mode 100644 index 57f670a..0000000 --- a/docker/minecraft/docker-compose.yml +++ /dev/null @@ -1,40 +0,0 @@ ---- -services: - mc: - image: itzg/minecraft-server:java23-graalvm - tty: true - stdin_open: true - ports: - - "25565:25565" - environment: - EULA: "TRUE" - MEMORY: ${MEMORY:-"6G"} - TZ: "Europe/Madrid" - VERSION: 1.20.1 - ENABLE_ROLLING_LOGS: true - USE_AIKAR_FLAGS: true - MOTD: "Huesoperrers Minecraft Episodio 2: Ahora es personal" - ICON: /data/icon.png - MAX_PLAYERS: 10 - MAX_WORLD_SIZE: 10000 - SEED: huesoperrers2 - MODE: survival - ONLINE_MODE: false - ALLOW_FLIGHT: true - SERVER_NAME: Huesoperrers and co. - PLAYER_IDLE_TIMEOUT: 15 - STOP_SERVER_ANNOUNCE_DELAY: 30 - WHITELIST: ${WHITELIST} - OPS: ${OPS} - SYNCHRONIZE: true - MERGE: true - ENFORCE_WHITELIST: true - ENABLE_RCON: false - MAX_TICK_TIME: -1 - USER_API_PROVIDER: ${USER_API_PROVIDER:-playerdb} - DIFFICULTY: ${DIFFICULTY:-normal} - ENABLE_AUTOPAUSE: true - DEBUG_AUTOPAUSE: false - TYPE: FORGE - volumes: - - ${MC_DATA_DIR:-/mnt/zeruel/nas1/shared/mc2}:/data diff --git a/k8s/argo-apps/valheim.yaml b/k8s/argo-apps/valheim.yaml deleted file mode 100644 index 699f2f2..0000000 --- a/k8s/argo-apps/valheim.yaml +++ /dev/null @@ -1,41 +0,0 @@ ---- -apiVersion: argoproj.io/v1alpha1 -kind: Application -metadata: - name: valheim - namespace: argocd -spec: - destination: - name: '' - namespace: apps-fuku - server: https://kubernetes.default.svc - sources: - - path: k8s/charts/valheim-server - repoURL: https://git.roboces.dev/catalin/fukuops.git - targetRevision: main - helm: - valuesObject: - server: - name: "Huesoperrers Váljei" - public: 1 - timezone: Europe/Madrid - secret: - name: valheim-secrets - key: server-password - persistence: - saves: - accessMode: ReadWriteMany - server: - accessMode: ReadWriteMany - backups: - accessMode: ReadWriteMany - resources: - requests: - memory: 4Gi - cpu: 2000m - limits: - memory: 8Gi - cpu: 4000m - project: fuku - syncPolicy: - automated: {} diff --git a/k8s/services/forgejo/sealedsecrets.yaml b/k8s/services/forgejo/sealedsecrets.yaml index 4281e2e..e33bd4a 100644 --- a/k8s/services/forgejo/sealedsecrets.yaml +++ b/k8s/services/forgejo/sealedsecrets.yaml @@ -1,3 +1,4 @@ +# yamllint disable rule:line-length --- apiVersion: bitnami.com/v1alpha1 kind: SealedSecret diff --git a/k8s/services/redis/sealedsecrets.yaml b/k8s/services/redis/sealedsecrets.yaml index 5514d72..f92c67f 100644 --- a/k8s/services/redis/sealedsecrets.yaml +++ b/k8s/services/redis/sealedsecrets.yaml @@ -1,3 +1,4 @@ +# yamllint disable rule:line-length --- apiVersion: bitnami.com/v1alpha1 kind: SealedSecret